Commit Graph

17074 Commits

Author SHA1 Message Date
ZomgPonies
abf033a38c Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-03-03 15:26:34 -05:00
Ccomp5950
2e7a92e815 Runtime fix: Depth scanner now won't check the length of null lists.
runtime error: Cannot read null.len
proc name: scan atom (/obj/item/device/depth_scanner/proc/scan_atom)
  source file: tools_depthscanner.dm,31
  usr: Some Guy (/mob/living/carbon/human)
  src: the depth analysis scanner (/obj/item/device/depth_scanner)
  call stack:
the depth analysis scanner (/obj/item/device/depth_scanner): scan atom(Some Guy (/mob/living/carbon/human), Rock (155,169,5) (/turf/simulated/mineral))
Rock (155,169,5) (/turf/simulated/mineral): attackby(the depth analysis scanner (/obj/item/device/depth_scanner), Some Guy (/mob/living/carbon/human))
Some Guy (/mob/living/carbon/human): ClickOn(Rock (155,169,5) (/turf/simulated/mineral), "icon-x=23;icon-y=13;left=1;scr...")
Rock (155,169,5) (/turf/simulated/mineral): Click(Rock (155,169,5) (/turf/simulated/mineral), "mapwindow.map", "icon-x=23;icon-y=13;left=1;scr...")
2014-03-03 15:26:30 -05:00
ZomgPonies
d0e5827507 Merge pull request #167 from alex-gh/implant_readd
re-added death alarm implanters
2014-03-03 15:23:59 -05:00
ZomgPonies
c9fbe145d9 paracetamol 2014-03-03 15:23:35 -05:00
ZomgPonies
b0e6b7ffa4 More useless debug text 2014-03-03 15:23:27 -05:00
ZomgPonies
1f407fa305 Singulo eats darkness, grows out of control? 2014-03-03 01:35:47 -05:00
ZomgPonies
84231d2feb Removed some debug text 2014-03-03 01:27:25 -05:00
ZomgPonies
1eaa17abcc Revert "Update PA."
This reverts commit e6ce757d4c.
2014-03-03 01:20:34 -05:00
ZomgPonies
f0aa94356a Savefiles out of date 2014-03-03 00:08:12 -05:00
ZomgPonies
41ea3775b4 Xenos update 2014-03-03 00:08:06 -05:00
ZomgPonies
b03ff54522 Singulo optimizations 2014-03-02 23:25:40 -05:00
ZomgPonies
4597183fae No infinite embryos anymore 2014-03-02 20:40:44 -05:00
ZomgPonies
d06abdd737 Facehugger bugs 2014-03-02 20:24:58 -05:00
Rob Nelson
30996e58d5 Use /tg/'s better GC code.
Conflicts:
	code/controllers/garbage.dm
2014-03-02 19:46:51 -05:00
Rob Nelson
e963a4993a GC tuning 2014-03-02 19:39:17 -05:00
ZomgPonies
157d6c987c Moar Xeno/xeno gamemode fixes 2014-03-02 19:36:42 -05:00
Rob Nelson
63905f1485 Fix GAC runtimes.
Conflicts:
	code/game/machinery/atmo_control.dm
2014-03-02 18:59:45 -05:00
VelardAmakar
fda0667650 Cryo should no longer give ten times the normal reagents to patients. 2014-03-02 18:41:26 -05:00
ZomgPonies
cb6e53d105 Access optimizations 2014-03-02 15:21:05 -05:00
Aryn
2100368c86 Set lighting overlay's name to empty string. 2014-03-02 15:15:31 -05:00
Aryn
b773a05600 Fixed some bugs regarding space lighting. 2014-03-02 15:14:12 -05:00
Aryn
9495c5b639 Fixed supply shuttle bug wherein the area types were actually tags. 2014-03-02 15:13:47 -05:00
Aryn
320d542c3f Temporary commit to back up data.
Conflicts:
	code/WorkInProgress/Aryn/Lighting/Controller.dm
2014-03-02 15:13:22 -05:00
ZomgPonies
78c70e4ce9 Xeno fixes 2014-03-02 04:45:59 -05:00
ZomgPonies
1f4aa15e03 More xenos fixes 2014-03-02 04:22:50 -05:00
alex-gh
c0d4c2c8f7 re-added death alarm implanters 2014-03-02 09:17:49 +01:00
ZomgPonies
a683de674a Custom fluff item for Lycaeon 2014-03-02 03:12:09 -05:00
TZK13
0a83349284 Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites.
Conflicts:
	code/game/machinery/autolathe.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/obj/ammo.dmi
2014-03-02 01:27:07 -05:00
ZomgPonies
dc1a375c74 Virology tweaks 2014-03-02 01:19:26 -05:00
ZomgPonies
bd2818017e Shit getting kicked out of it's body on death/evolve 2014-03-01 23:46:31 -05:00
alex-gh
d04d86a0c3 Despawning in cryo pods no longer prematurely end rev rounds. 2014-03-02 04:41:06 +01:00
ZomgPonies
3e69a210a5 More xeno stuff fixes 2014-03-01 19:16:53 -05:00
ZomgPonies
51064c893e Xenoborg fixes 2014-03-01 18:46:58 -05:00
ZomgPonies
77989d78a5 Added a crushing to the recycling stuff 2014-03-01 02:50:44 -05:00
ZomgPonies
01fd39efb6 Xeno gamemode bugfix 2014-03-01 02:45:52 -05:00
ZomgPonies
d0ba2cd0e3 Efficiency: Joblist 2014-03-01 00:41:18 -05:00
MrPerson
586125b939 Also screwed up an examine bit. 2014-02-28 22:22:11 -05:00
MrPerson
2b98a6d638 Woops fucked up Tourette's 2014-02-28 22:21:51 -05:00
MrPerson
5bb608e56e Redo of jitteriness and dizziness.
Fixes #2923

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_defines.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-28 22:21:33 -05:00
ZomgPonies
207959cc7d crash fix 2014-02-28 21:31:59 -05:00
ZomgPonies
a39b199cfb Exploit fix 2014-02-28 21:24:01 -05:00
Ccomp5950
09bfeb737b Runtime fix: I have no UI, and I must close it.
runtime error: Cannot execute null.close().
proc name: Topic (/obj/item/device/pda/Topic)
  source file: PDA.dm,485
  usr: Garry Myers (/mob/living/carbon/human)
  src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
  call stack:
PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
2014-02-28 21:03:05 -05:00
ZomgPonies
4804517c31 Updated vox announcement sounds 2014-02-28 20:11:57 -05:00
d3athrow
196ac24af2 Fix Malfunction picking an AI who doesn't have BE_MALF toggled on 2014-02-28 19:58:34 -05:00
Rob Nelson
6683a3cb0d Hopefully fix green skin not vanishing when mut is removed. Fixes Redmine #113 2014-02-28 19:57:49 -05:00
Rob Nelson
1a2adaaadb Make good/bad mutations dynamically assigned.
Conflicts:
	code/game/dna/dna2_helpers.dm
2014-02-28 19:56:52 -05:00
Rob Nelson
034a54cc62 Fix some fire issues. (Implements Redmine #135) 2014-02-28 19:51:44 -05:00
Rob Nelson
ebb188dbfd fatties no longer able to eat people instantly, takes 5 seconds, and it leaves the head of the victim in their belly. 2014-02-28 19:51:19 -05:00
Rob Nelson
f668d4f405 Hopefully fix incendiary mito. Fixes Redmine #130 2014-02-28 19:50:49 -05:00
Rob Nelson
2dd3bd53bd Deactivate hulk after collapse. 2014-02-28 19:49:39 -05:00