Chinsky
04237f47cb
Merge pull request #3894 from DJSnapshot/master
...
Fix for fire alarms in Mining and Research Outpost
2013-11-07 16:27:38 -08:00
DJSnapshot
7c59c41b13
Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.
2013-11-07 16:02:57 -08:00
Kilakk
ee34d281f9
Fixes #3890 , gave Aloe a more reasonable boozepwr
2013-11-07 18:54:42 -05:00
Mloc
96ebb4edc8
Merge pull request #3889 from zekesulastin/genetics-beaker
...
Fixes duplicate beaker on Eject Occupant
2013-11-07 02:48:49 -08:00
ZekeSulastin
4dae789cb5
Fixes duplicate beaker on Eject Occupant
2013-11-06 19:37:56 -05:00
Chinsky
1f110d5a74
Merge pull request #3885 from DJSnapshot/master
...
Cleanbot now cleans mucus
2013-11-05 23:34:44 -08:00
DJSnapshot
3aa8d088bd
cleanbot now cleans mucus
2013-11-05 22:24:02 -08:00
Mloc
d228089601
Merge pull request #3880 from comma/master
...
Where can I get my idiot certificate.
2013-11-04 16:05:07 -08:00
Chinsky
b7edb181ed
Where can I get my idiot certificate.
2013-11-05 03:59:39 +04:00
Mloc
2eb98fd86e
Merge pull request #3879 from comma/master
...
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4
derp
2013-11-05 03:17:44 +04:00
Mloc
68f796b572
Merge pull request #3874 from comma/master
...
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00
GC's virus dummies #whoa #derp
2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328
Dun goofed
2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095
Another uncommented log debug line.
2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f
Fix so bans can work again.
2013-11-04 13:07:03 -08:00
Mloc
86ebf818f1
Merge pull request #3872 from comma/master
...
Goasts & Spam
2013-11-04 10:49:07 -08:00
Chinsky
9c6a51b3fb
Commens out debuglog spam in side effects
2013-11-04 22:38:55 +04:00
Chinsky
98ba7e4699
Fixes zombie goast tableflips
2013-11-04 22:36:22 +04:00
Chinsky
6152644155
Merge pull request #3868 from DJSnapshot/master
...
Devs are speshul snoflakes too.
2013-11-03 19:19:36 -08:00
DJSnapshot
6ef89ef868
Devs are speshul snoflakes too.
2013-11-03 19:18:33 -08:00
Chinsky
8c69e3d8b7
derp
2013-11-04 05:53:10 +04:00
Mloc
7fdcf3deee
Merge pull request #3866 from comma/master
...
Itty bitty antilag bits.
2013-11-03 17:21:20 -08:00
Chinsky
6402581595
Itty bitty antilag bits.
...
-If wound disappears, do not process it.
-Moved reagents checks so they are only done when wound is internal. They have no effects on non-internal wounds anyway.
-Calling update_body only when losing limbs, other times UpdateDamageIcon(] is right proc
2013-11-04 05:16:04 +04:00
DJSnapshot
231131c1f5
Merge pull request #3814 from Baystation12/dev-freeze
...
0.1.5 merge.
2013-11-03 14:02:16 -08:00
Mloc
64ca8fb853
Merge pull request #3865 from DJSnapshot/master
...
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:33:05 -08:00
DJSnapshot
11f0b1ef92
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:31:54 -08:00
Mloc
ad9139304d
Merge pull request #3864 from comma/master
...
VG ZAS Fire stolen
2013-11-03 08:33:03 -08:00
Chinsky
a210c1b613
derp XOR
2013-11-03 20:31:50 +04:00
Chinsky
8274114e47
VG ZAS Fire stolen
2013-11-03 20:28:26 +04:00
DJSnapshot
acc94c6f85
Fix for auto-transfer being called every 10 minutes after the first 3 hours.
2013-11-02 18:11:09 -07:00
Mloc-Argent
593c10d9f5
Fix for trace_gases getting massive and killing the server.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-02 21:30:44 +00:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
DJSnapshot
69389d392c
Fix for https://github.com/Baystation12/Baystation12/issues/3813
2013-11-02 11:45:26 -07:00
Mloc
93530a3ac4
Merge pull request #3850 from DJSnapshot/master
...
end of 2spookyday event
2013-11-01 08:03:11 -07:00
DJSnapshot
78055b44a8
Used multi-line comments instead because Mloc and Chinsky didn't like me cheating DM for less characters.
2013-11-01 08:00:38 -07:00
DJSnapshot
13cb84f620
end of 2spookyday event
2013-11-01 07:30:45 -07:00
Mloc-Argent
ff5e2496aa
Fix for air alarms doing weird things on zones with low amounts of air.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-28 23:27:04 +00:00
Mloc
6bc10820d8
Merge pull request #3830 from DJSnapshot/master
...
Seekrit update
2013-10-27 15:29:42 -07:00
DJSnapshot
22cbb0fe17
Seekrit halloween update
2013-10-27 15:25:12 -07:00
Segrain
7ffafb657e
Fix for acid pouring.
2013-10-27 21:56:08 +03:00
Segrain
93cfba21a7
Fix for #3826 .
2013-10-27 21:55:08 +03:00
Segrain
9df65d4294
Merge remote-tracking branch 'upstream/master' into dev-freeze
2013-10-27 21:44:13 +03:00
Mloc
2a52e94d18
Hopefully. Hopefully was the key word.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-27 15:50:07 +00:00
Mloc
f99633e934
Merge pull request #3824 from DJSnapshot/dev-freeze
...
small fix to autotransfer voting
2013-10-27 05:10:23 -07:00
Mloc
a1fd865b1a
(hopefully) Final fix for ZAS for 0.1.4.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-27 12:08:40 +00:00
DJSnapshot
aeff49f742
Small fix so voting isn't always shouting at you for not being an admin or mod.
2013-10-26 22:49:16 -07:00
Kilakk
91e440e26c
Fixes #3801 , C4 will no longer destroy the analyzer it's inside of
...
Committed to dev-freeze because the fix doesn't work with the click code on master
2013-10-27 00:42:11 -04:00
Segrain
858df5ca64
Fix for #3804 .
2013-10-24 19:16:54 +03:00
Segrain
7af8066052
Balance fix.
2013-10-24 19:14:39 +03:00
