Commit Graph

3384 Commits

Author SHA1 Message Date
Jordie 416cbee62c Xrays shoot everything but walls 2013-10-09 18:05:33 +11:00
Jordie 272038e2e7 Xray guns unique and buildable 2013-10-09 01:31:39 +11: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 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
Intigracy 3681601b1b There's still discussion to be had before this gets merged. 2013-10-06 16:39:02 -07: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 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 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
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 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
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
Pete Goodfellow 65909d0a33 Merge branch 'master' of github.com:tgstation/-tg-station into sayustat
Conflicts:
	code/modules/mob/mob_defines.dm
2013-09-29 22:27:35 +01:00
Miauw cf081cdef7 More removing of emote limiter 2013-09-29 18:16:20 +02:00
Pete Goodfellow 7d62637f91 Merge pull request #1477 from VistaPOWA/bloodiestest_trails
Adds new blood trail sprites (now mergeable)
2013-09-29 08:22:57 -07:00
Miauw 3d0653ac30 Removed xeno emote limiter 2013-09-29 15:57:30 +02:00
Miauw 67e7eb86bd You can no longer turn on depleted APCs for a split-second 2013-09-29 14:31:26 +02:00
VistaPOWA 0a19a0739f Adds new blood trail sprites
Adds validsalad's blood trail sprites and gives the trails a bit more
variety.

Matches the blood's hue with the trail's hue.

Fixes rare runtime error regarding blood trails.
2013-09-29 12:40:57 +02:00
ACCount12 bb19b96616 Removes again the NOREACT flag from mobs, I did it because fun. 2013-09-29 21:39:06 +13:00
ACCount12 110e0f420a Sparks! 2013-09-29 21:25:38 +13:00
ACCount12 78e91a59c1 Sparks! 2013-09-29 21:23:13 +13:00
Aranclanos a7a9a27ffb Merge pull request #1460 from Giacomand/nobreathe
Blob Spore Clouds
2013-09-28 17:19:44 -07:00
Aranclanos 05e894751a Merge pull request #1413 from JJRcop/nar-sie-red-alert-fix
Fixes corner-case exploit regarding nar-sie and red alert
2013-09-28 15:47:15 -07:00
Aranclanos 4ba95ec038 Merge pull request #1425 from RobRichards1997/21/09/2013-Engiborg-Floortiles
Gives Engiborgs Floortiles
2013-09-28 15:43:58 -07:00
Aranclanos c219c9e4ba Merge pull request #1405 from Incoming5643/toyAI
Adds a toy AI to the arcade machine prize list
2013-09-28 14:58:53 -07:00
Aranclanos 6d87e5a11d Merge pull request #1389 from KazeEspada/computers
Cleans up computer code severely.
2013-09-28 14:48:42 -07:00
Cael Aislinn 4ea0fe35b0 Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire
Mobs on fire: The return: The reckoning
2013-09-28 10:00:24 -07:00
Miauw bf4a160967 Fixed constructs being damaged to negative health & added ectoplasm spawning to Die() 2013-09-28 18:46:57 +02:00
Miauw 492c79974d MMI's no longer magically transmute alien brains into normal brains. Cleaned up the code a bit. 2013-09-28 15:59:02 +02:00
Giacomand f5e3037e6d Merge branch 'master' of https://github.com/Giacomand/-tg-station into nobreathe
Conflicts:
	code/game/objects/effects/effect_system.dm - Resolved.
2013-09-28 01:07:20 +01:00
Giacomand 6731722bff Made blob spores a bit more useful! On death they will release a spore cloud which will slightly (0.5 per tick) damage people and cloud your vision until the effect wears off. 2013-09-27 10:24:58 +01:00
Cheridan a80d99cd76 Merge pull request #1445 from Neerti/9-24-2013_flowers_in_hair
Wear flowers in your hair!
2013-09-25 22:06:08 -07:00