PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
PsiOmega
6658f52ced
Merge remote-tracking branch 'upstream/master' into dev
2015-05-04 14:56:15 +02:00
PsiOmegaDelta
d86dd60c63
Merge pull request #9064 from Loganbacca/smokeFix
...
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
PsiOmegaDelta
5d13f3091c
Merge pull request #9067 from Jarcolr/gauniform
...
Adds foxeye's approved custom item
2015-05-02 21:19:22 +02:00
Chinsky
a9b1f8bfe0
Merge pull request #9042 from PsiOmegaDelta/Buttons
...
Small remote button refactor.
2015-05-02 19:50:24 +03:00
Jarcolr
471988b080
Adds foxeye's custom item
...
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
2015-05-02 11:19:52 +03:00
volas
93d120a24c
merge fix
2015-05-02 11:16:15 +03:00
Chinsky
d5495870d1
Merge pull request #9045 from mwerezak/resist
...
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
Chinsky
aeda1db3c5
Merge pull request #9041 from PsiOmegaDelta/ChitterChitter
...
Fixes #9029 .
2015-05-02 08:22:09 +03:00
Chinsky
144c1eb321
Merge pull request #9033 from mwerezak/zas-fix
...
Fixes #8987 , lost edges from merged zones
2015-05-02 08:21:53 +03:00
Chinsky
8f1a9a9375
Merge pull request #9040 from PsiOmegaDelta/LOOCToggle
...
Admins can now toggle OOC and LOOC separately from each other.
2015-05-02 08:21:50 +03:00
Loganbacca
6238dabf88
Chem smoke fadeOut sanity checks
...
Ported updates from /tg/ to fadeOut code. Updates written by vista-
2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b
Adds a closet breakout animation, fixes spamming the breakout proc
2015-05-01 16:19:52 -04:00
mwerezak
3509178aa8
More resist refactoring
...
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04:00
Ccomp5950
3baed4686e
Merge pull request #9039 from PsiOmegaDelta/QdelBullet
...
Fixes #9037 .
2015-05-01 10:45:10 -04:00
PsiOmega
b34e44ab84
Mice are now numbered.
...
You are not a man. This should also make things easier for admins.
2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e
Fixes #9044
...
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -04:00
mwerezak
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279
Resist verb cleanup
...
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Chinsky
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
PsiOmega
5bbe839092
Fixes an ancient bug where door buttons toggling bolts were inversed, causing the first click to do nothing.
2015-04-30 19:34:25 +02:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
PsiOmega
904efa322f
Breaks up the remote door control button into subtypes, depending on what is remotely controlled.
...
Also ensures that the door button respects cut wires, etc.
2015-04-30 18:26:31 +02:00
PsiOmega
990b7b81a8
Another potential qdel sanity check.
2015-04-30 14:37:52 +02:00
PsiOmega
a49e6035a9
Fixes #9029 .
...
Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
2015-04-30 10:22:58 +02:00
PsiOmega
82a8f32783
Admins can now toggle LOOC separately from OOC.
...
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
PsiOmega
40f0901e3d
Fixes #9037 .
...
Just one of many potential qdel issues. More to come, yay.
2015-04-30 09:35:57 +02:00
PsiOmega
f72fe0d194
Merge remote-tracking branch 'upstream/master' into dev
2015-04-30 08:09:25 +02:00
mwerezak
03e88ca9a5
Updates locate(/obj/machinery/door/airlock) hack
2015-04-29 20:53:50 -04:00
mwerezak
a80cb1b44e
Fixes edges being lost when zones are merged
2015-04-29 20:27:39 -04:00
mwerezak
277103f1cd
Fixes tiny door zones
...
Fixes #8987 by deferring the update of self-zone-blocked turfs until after non-self-zone-block turfs have updated (and thus have valid zones).
2015-04-29 13:01:26 -04:00
Yoshax
233b9a5d11
Adds Sabess' custom item
2015-04-29 16:47:20 +01:00
Yoshax
2c4783386f
Removes CE's hardhat
2015-04-29 16:11:53 +01:00
Kelenius
bd6a8e4d54
Chemistry-Holder.dm: absolute paths
2015-04-29 13:53:04 +03:00
Chinsky
34bbe33030
Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
...
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
mwerezak
fbede7a193
Minor ZAS-related cleanup
2015-04-28 23:00:56 -04:00
Yoshax
e5cd8c7adb
Fixes jacket
2015-04-28 20:40:16 +01:00
Yoshax
6c8bc809c6
Adds more items to custom loadout
2015-04-28 20:37:57 +01:00
PsiOmegaDelta
851d5423f3
Merge pull request #8971 from mwerezak/burst-fire
...
Gun firemode system, burst firing
2015-04-28 20:24:03 +02:00
Zuhayr
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
mwerezak
19aff88b90
Fixes #9017
2015-04-28 12:22:21 -04:00
Zuhayr
74db1f71b5
Merge pull request #9018 from Kelenius/ofChemAndTwo
...
Chemistry recipes: absolute pathing
2015-04-29 00:15:20 +09:30
Kelenius
185aadb5a9
Chemistry recipes: absolute pathing
2015-04-28 16:55:13 +03:00
Chinsky
04b994f939
Merge pull request #9008 from PsiOmegaDelta/CameraPoff
...
Adds the APC & camera damage events.
2015-04-28 13:49:50 +03:00
PsiOmega
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624
Merge pull request #9015 from Kelenius/ofChemAndOne
...
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
