Commit Graph

14 Commits

Author SHA1 Message Date
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
xxalpha 50e4b1a024 Fixes jetpack trail animation.
Fixes jetpack trail animation 2.
2015-03-17 21:22:47 +00:00
Iamgoofball 4def104810 Makes smoke effect all /mob/living. 2015-03-14 22:26:14 -07:00
Iamgoofball e5a3694c0f Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff. 2015-03-08 19:43:17 -07:00
Iamgoofball 8dfcbd8b24 Changes smoke back to TOUCH reaction. 2015-03-08 17:04:45 -07:00
Iamgoofball e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
Mandurrrh 48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Iamgoofball 3964cb3126 Adds heart attacks properly. 2015-03-02 20:50:48 -08:00
Iamgoofball 3b2963dcab More changes, more bugs 2015-02-28 10:19:52 -08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Cheridan 85ec168881 Foam spreading now respects type. 2015-02-14 13:32:32 -06:00
Cheridan 69b856f373 Saving before I ruin everything
Lightning works too
Cleans up old shit from Chemistry-Recipes.dm
2015-02-14 11:46:20 -06:00
Cheridan 284223102e Reagent foam works
TODO: Make metal foam work
2015-01-26 00:17:15 -06:00
Cheridan aa3b7d9a75 Splits effect_system.dm into individual files. 2015-01-25 13:57:45 -06:00