Commit Graph

6384 Commits

Author SHA1 Message Date
Mloc-Argent d2e8531ee5 Made cyborg middle-clicks cycle through the list of selected modules, and added some new helper procs for selected modules.
New procs:
* module_selected(module) - Checks whether the module slot specified by "module" is currently selected.
* module_active(module) - Checks whether there is a module active in the slot specified by "module".
* get_selected_module() - Returns the slot number of the currently selected module.  Returns 0 if no modules are selected.
* select_module(module) - Selects the module slot specified by "module"
* deselect_module(module) - Deselects the module slot specified by "module"
* toggle_module(module) - Toggles the selection of the module slot specified by "module".
* cycle_modules() - Cycles through the list of selected modules.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:57 +01:00
Mloc-Argent db0a908038 Make energy weapons not get a bloody overlay and fixed alt-gr not calling AltClick()
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:56 +01:00
Mloc-Argent 9de132a0a3 Small fixes and a new atom flag.
* Fixes the ( shaped cyan wire
* Fixes a luminosity bug with glowshrooms.
* Changes a ridiculous internal loop in intercoms to use the MC.
* Makes intercoms not be bloodied by bloody hands.
* Adds a "NOBLOODY" flag for atoms that don't want to be bloodied.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:55 +01:00
MrPerson 5347cac68a Merge pull request #1494 from Giacomand/clickmobopt
Hostile Mobs Attacking Through Window Fix
2013-10-07 12:55:04 -07:00
Giacomand cbb395dc02 * Added the same for the AI and Cyborg click code. 2013-10-07 20:47:55 +01:00
Aranclanos da07db8227 Merge pull request #1513 from Malkevin/galoshesB
Galoshes B: Janicart crate comes with galoshes
2013-10-07 07:17:51 -07:00
Giacomand 796f3ca9f1 Merge pull request #1517 from Mloc/tg-byond500
[MAP] Refactors the code to work with BYOND 500.  Big commit.
2013-10-07 07:05:46 -07:00
Aranclanos d062009a6e Merge pull request #1507 from Giacomand/napalm
Napalm works again, which fixes incendiary grenades.
2013-10-06 17:01:46 -07:00
Giacomand ef41ccf5da * Removed SPAWN_COLD 2013-10-07 00:55:52 +01:00
EuroNumbers 45f89c064c Merge pull request #1521 from Intigracy/noreactflag
NOREACT flag fix
2013-10-06 16:43:37 -07:00
Intigracy 3681601b1b There's still discussion to be had before this gets merged. 2013-10-06 16:39:02 -07:00
Aranclanos f4972ee3a4 Merge pull request #1503 from Giacomand/lockersuffocation
Fixes lockers suffocating you in 5 minutes. Fixes #1227
2013-10-06 16:24:26 -07:00
Giacomand d36535a433 * Removed the spawn fuel option. 2013-10-07 00:20:35 +01:00
Aranclanos 5b2f3b34d9 Merge pull request #1476 from ACCount12/noreact
[DISCUSSION/DO NOT MERGE] NOREACT removed from mobs
2013-10-06 16:17:09 -07:00
Giacomand acec04c001 Merge pull request #1483 from Ergovisavi/ied_fix
Fixes issue #1418
2013-10-06 16:02:48 -07:00
Giacomand e2c4a14606 Merge pull request #1501 from Ergovisavi/mobsonfire_2
Mobs on Fire - Atmos interaction and Bodytemp Damage tweaks
2013-10-06 15:55:20 -07:00
Giacomand 5d490fcdb4 Merge pull request #1498 from Khubajsn/jobOccupationRightClick
Fix for my 'new' job preferences screen
2013-10-06 15:53:40 -07:00
Giacomand 0c2c02e284 Merge pull request #1484 from VistaPOWA/explosive_dirt_cleaning
Makes decals disappear after an explosion
2013-10-06 15:48:45 -07:00
Giacomand b4b0cfaf54 Merge pull request #1402 from Petethegoat/sayustat
Ported and improved Sayu's awesome alt-click stat panel.
2013-10-06 15:42:49 -07:00
Aranclanos 915663e90c Merge pull request #1407 from Rolan7/Issue1404-PlantBGone
Fixes #1404 by changing how hydro trays can receive reagents.  Pretty much...
2013-10-06 13:53:23 -07:00
Mloc-Argent 79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Aranclanos 42b738f28c Merge pull request #1508 from Ergovisavi/toydualfix
Fixes an issue where toy dualsabers would reflect like actual dualsabers
2013-10-06 11:04:27 -07:00
Malkevin f91cc22868 Galoshes B: Janicart crate comes with galoshes
Adds a pair of Galoshes to the Janicart crate

This alternative allows new spawning Janitors to get their noslips, allows HoP assigned Janitors to get their no slips, and maintains the ability for thieving greyshirts to steal the janitors yellow boots, and gives cargo something else to order.

The reason I chucked in a free pair of galoshes into the janicart crate instead of making a new crate is because I see that crate as the new janitor's starter pack, and its also to incentivise that the crate is meant to be ordered for new janitors and not power gaming assholes (although they probably will still do it -meh).

The reason for this change is because the HoP can increase the number of Janitors on station (which is a good thing for them to do because one janitor can't keep the station clean), however the new janitors are at a disadvantage because they can never get a pair of no slip galoshes and Aran made it so only water can clean stuff via mopping, not even space cleaner works.
2013-10-06 13:50:35 +01:00
Aranclanos fddb2deb32 Merge pull request #1351 from Sabbat/Tome-Rework
Tome rework (don't merge)
2013-10-05 19:39:40 -07:00
Sabbat 9dc50e9ce8 Update ritual.dm 2013-10-05 18:39:09 -07:00
Sabbat 862f2915f9 Update runes.dm 2013-10-05 18:35:17 -07:00
Sabbat ced984d835 Update ritual.dm 2013-10-05 18:35:01 -07:00
Giacomand 6ef330ec3e * Made frostoil use SPAWN_COLD when used on a turf. 2013-10-06 00:41:40 +01:00
Giacomand 3b667227e5 * Made atmos_spawn_air() use flags.
* Replaced "fire" with SPAWN_HEAT. You will have to use it in conjunction with SPAWN_TOXINS to spawn fire.
 * Added flags for HEAT, COLD, TOXINS, OXYGEN, CO2, NITROGEN, N2O, FUEL and AIR.
2013-10-06 00:29:45 +01:00
Ergovisavi cc2113212b Fixes an issue where toy dualsabers would reflect like actual dualsabers 2013-10-05 15:21:14 -07:00
Ergovisavi 06eb96b53c Fixing mobs on fire with luminosity
Admin heal now calls ExtinguishMob() so it updates luminosity properly
Added some lines to simple mobs to stop them from using the on fire system at the moment (Needs sprites!)
2013-10-05 15:06:49 -07:00
Giacomand f6e62cd830 * Napalm works again, which fixes incendiary grenades.
* Stopped the fuel and n20 option, in spawn_air, from runtiming.
 * Added toxins as a spawn_air option.
 * Removed all use of the fuel option and replaced it with toxins, since fuel does not work with LINDA anymore.
2013-10-05 23:06:24 +01:00
Giacomand 983010e58b * Fixes lockers suffocating you in 5 minutes. Fixes #1227 2013-10-05 20:20:09 +01:00
Cheridan e029c078ef Merge pull request #1478 from Miauw62/variousfixes
Various Fixes
2013-10-05 12:04:13 -07:00
Ergovisavi 13d953121d Tweaks for atmos fire and mob interactions
-Hot air is less lethal
-Fire is more lethal
-Catch on fire when entering a hotspot but fire_stacks given dropped to 0.5 each
-You now light up your environment while on fire
2013-10-05 10:40:28 -07:00
khubajsn 249e77d775 Tweaked the [High] color to more match the original one (because I am too lazy to make it not include the font tag) 2013-10-05 00:12:40 +02:00
khubajsn 44bd0e3186 Removing debug. 2013-10-04 23:47:38 +02:00
khubajsn 900cb36a29 No longer assuming the targetted job level, it'll be forcibly set from now on. This should prevent any issues where a job cannot be switched either way (up/down). 2013-10-04 23:40:45 +02:00
Miauw 4adf4fa4e9 Improved APC fix: breaker can be toggled regardless of power, power can be set to off or auto when there's no power instead of only off. 2013-10-04 20:14:07 +02:00
Giacomand 0bb72fcb66 * Fixed hostile mobs being able to attach through windows (thanks to the new click code's Adjacent proc)
* Made the shift examine turn your mob again.
 * Slightly optimized getting the modifier params, in the click code.
2013-10-04 14:44:53 +01:00
Rolan7 55f8959e56 The trans_to proc for /datum/reagents/ now detects and accepts /datum/reagents/ as targets instead of just reagent_containers. Updated the hydroponics attack_by to use that new feature. Improved the microwave-cleaning to use amount_per_transfer_from_this. It does ignore other reagents, only using up space cleaner, because it really doesn't need to be complicated. 2013-10-04 00:27:30 -04:00
Cheridan 35d73f1986 Merge pull request #1475 from ACCount12/sparky
Sparks!
2013-10-03 18:56:25 -07:00
Rolan7 4a88f8c6d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue1404-PlantBGone 2013-10-03 19:04:25 -04:00
AndroidSFV 52c896103c Removes unnecessary commented stuff 2013-10-01 23:55:36 -05:00
AndroidSFV 93497b4c3f Expansion of AI Photography. AI can now target which turf is the center of the picture taken. Other fixes included. 2013-10-01 23:10:38 -05:00
Aranclanos 8951df41c7 Merge pull request #1449 from Miauw62/xenofix
Fixed various xeno issues.
2013-10-01 05:18:44 -07:00
Cheridan ad6fa779b5 Merge pull request #1446 from Ricotez/airlockpainterfixes
Fixes and improvements to airlock painters.
2013-09-30 19:15:30 -07:00
VistaPOWA 620cdb8566 Removes extra var from decals
oops that wasn't meant to be included
2013-09-30 22:32:42 +02:00
VistaPOWA b5fff895ee Makes decals disappear after an explosion
Fixes runes, dirt, blood, etc remaining and floating in space after an
explosion.
Gibs are excluded from this change.
2013-09-30 20:19:41 +02:00
Ergovisavi e473b76335 Fixes issue #1418
Adds a range check for filling up IED'S.
2013-09-29 18:43:09 -07:00