Ccomp5950
b97434054f
APC Area update initial commit.
...
Conflicts:
code/modules/mob/mob.dm
code/modules/power/power.dm
2014-03-08 17:00:43 -05:00
Chinsky
0b47e16828
Fix for #4542
...
Now synthetics do not contract viruses
Conflicts:
code/modules/virus2/helpers.dm
2014-03-08 16:44:59 -05:00
ZomgPonies
4f68015073
Compile fix
2014-03-07 22:53:37 -05:00
ZomgPonies
6035a0a5c0
MOAAAAR ponies
2014-03-07 22:51:49 -05:00
ZomgPonies
adde0bd14e
Moar ponies
2014-03-07 22:28:29 -05:00
Chinsky
a53e9f285e
I CERTAINLY DID NOT MAKE A TYPO WHAT ARE YOU TALKING ABOUT
2014-03-07 15:56:46 -05:00
Chinsky
88dea23510
Sanity plugs for two runtimes in lightning code
2014-03-07 15:56:33 -05:00
ZomgPonies
c751ee454c
Small fixes
2014-03-06 22:45:38 -05:00
ZomgPonies
8ee94ad622
alien weeds also
2014-03-06 22:23:19 -05:00
ZomgPonies
950b5bf8d7
Make blob actually vulnerable to fire sometimes maybe?
2014-03-06 22:20:29 -05:00
ZomgPonies
63261dc415
Compile fix
2014-03-06 22:10:07 -05:00
d3athrow
d8fa6f65dc
Dionas can't into guns
...
Conflicts:
code/modules/projectiles/gun.dm
2014-03-06 21:07:43 -05:00
d3athrow
060825b485
Fix ragin mages maybe
2014-03-06 21:06:31 -05:00
ZomgPonies
08294457cc
Fuck your shading.
2014-03-06 20:56:22 -05:00
ZomgPonies
22765ac4d7
autoinjector
2014-03-06 20:13:48 -05:00
ZomgPonies
7ad775b0a2
Statue fixes
2014-03-06 19:59:07 -05:00
ZomgPonies
ec225e3344
fixes flatdough sprite
2014-03-06 18:22:57 -05:00
ZomgPonies
4e61310dc9
Compile fixes
2014-03-06 17:00:45 -05:00
melandor0
f57998a006
Mouse Ears
...
Yay! A child of kitty ears.
2014-03-06 16:43:25 -05:00
ZomgPonies
d15a9c1b99
Museum first iteration
2014-03-06 16:33:41 -05:00
alex-gh
1ba12a59b8
Added IAA to protected jobs list
2014-03-06 15:25:30 +01:00
Cheridan
e0ad288db5
support for alternate mecha step sounds
...
better sprites and code for mime mecha
Conflicts:
code/game/mecha/mecha_wreckage.dm
icons/mecha/mecha.dmi
2014-03-05 22:50:28 -05:00
Cheridan
b66abb1a6e
adds the mime mech
...
Conflicts:
code/game/mecha/equipment/weapons/weapons.dm
code/modules/projectiles/projectile/bullets.dm
icons/mecha/mecha.dmi
icons/mecha/mecha_equipment.dmi
2014-03-05 22:43:36 -05:00
Jeremy Liberman
99a588631a
Wearing masks or straight jackets blocks chewing on your wrists
2014-03-05 22:27:40 -05:00
Jeremy Liberman
b6905e6668
Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic
...
Conflicts:
code/modules/mob/living/living.dm
2014-03-05 22:27:33 -05:00
Jeremy Liberman
55ba32d02d
Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free.
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2014-03-05 22:20:44 -05:00
d3athrow
72f985f3ea
Missed a reference for radio devices
2014-03-05 20:37:40 -05:00
ZomgPonies
16ea3bde04
Compile fixes
2014-03-05 20:37:02 -05:00
d3athrow
977addd8fb
merge MrPerson's qdel fixes
2014-03-05 20:30:56 -05:00
d3athrow
3e4a4992e4
Loop through garbage queue to remove nulls
2014-03-05 20:29:58 -05:00
d3athrow
796aaa5c61
fix comments
2014-03-05 20:29:40 -05:00
d3athrow
0f0984fa57
hurf
2014-03-05 20:29:10 -05:00
d3athrow
dc50b47971
More Destroy stuff
2014-03-05 20:28:38 -05:00
d3athrow
4f168d8caf
qdel and Destroy() improvements, now done through objects/items/devices
2014-03-05 20:28:17 -05:00
d3athrow
19d339c45d
Furthur optimizing qdel and Destroy for obj/effect
...
Conflicts:
code/game/objects/effects/decals/Cleanable/humans.dm
2014-03-05 20:26:40 -05:00
Rob Nelson
745e038a60
QDEL is off by default.
2014-03-05 20:18:59 -05:00
Joey Haas
274c85aac5
Added 3D glasses to Dormitory
...
Conflicts:
icons/mob/eyes.dmi
icons/obj/clothing/glasses.dmi
maps/tgstation2.dmm
2014-03-05 19:40:58 -05:00
yashaldie
a0c6d29bab
fixes IPC brain surgery
...
could not start the brain surgery on IPCs this should fix it
2014-03-05 19:35:56 -05:00
Mloc-Argent
6beebb5975
Dionaea can no longer steal blood from species which have the NO_BLOOD flag
...
Fixes #4510
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
2014-03-05 19:34:21 -05:00
Ccomp5950
cd201dc3a5
NanoUI Optimizations.
...
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.
Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.
Modes that will no longer autoupdate at all: Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks: APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)
Some other things that I just can't remember right now.
Conflicts:
code/defines/obj.dm
2014-03-04 00:37:44 -05:00
ZomgPonies
ab707a9c3c
Custom guitar item for scrat
2014-03-03 23:02:12 -05:00
Rob Nelson
5adbbafb5e
Fix another runtime.
2014-03-03 20:49:17 -05:00
d3athrow
1a1103a77b
Fix getting die a glorious death along with a theft objective
2014-03-03 20:45:27 -05:00
Rob Nelson
8bd9502981
GC fixes, debug verb for toggling.
2014-03-03 19:11:20 -05:00
Rob Nelson
53f1810651
Revert /tg/ GC
...
Conflicts:
code/controllers/garbage.dm
2014-03-03 19:10:45 -05:00
Rob Nelson
f6c6eafc9d
Nerf eat
...
Conflicts:
code/modules/organs/organ_external.dm
2014-03-03 19:05:55 -05:00
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
