DJSnapshot
c20c84b328
Dun goofed
2013-11-04 13:10:33 -08: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
Segrain
6cf485deae
Quickfix.
2013-10-24 19:13:05 +03:00
Segrain
c8fcabc181
Smallfix.
2013-10-24 19:11:04 +03:00
Segrain
bc9f57e66d
Sprite fix.
2013-10-24 19:09:45 +03:00
Segrain
d8f0c43be1
Merge remote-tracking branch 'upstream/master' into dev-freeze
2013-10-24 19:02:56 +03:00
Segrain
5698addc75
Code cleanup.
2013-10-24 09:54:15 +03:00
Chinsky
0dc3b3c31e
Merge pull request #3808 from Mloc/sleepyzas
...
Moves around some ZAS stuff and fixes some things in FEA gas mixtures.
2013-10-23 22:04:22 -07:00
Chinsky
74f898a1a2
Merge pull request #3809 from DJSnapshot/antag
...
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430
Fix for sunglasses and night vision goggles
2013-10-23 19:51:01 -07:00
Mloc
5234b1394b
Moves around some ZAS stuff and fixes some things in FEA gas mixtures.
...
ShareSpace now can take a gas mixture as an argument, alongside the usual list of tiles.
Three new procs on gas mixtures, add() multiply() and divide(). Self explanatory.
Zones with unsimulated tiles that sleep will now reset themselves to the average air.
assume_air will only add air to sleeping zones with unsimulated tiles if it can wake the zone up.
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-23 22:04:31 +01:00
Chinsky
1488850ad1
Merge pull request #3803 from Nanai/dev
...
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
Nanai
101459ed49
Replaces Jailbreaker Verte with Warlock's Velvet in the contraband crate. Guarenteed !!!fun!!!
2013-10-21 07:13:04 -04:00
Nanai
50f2f0ae46
Removes pin necessity on vending machines.
2013-10-21 07:12:23 -04:00
Nanai
4c01ecaee4
Fixed iced tea, adds canned ice tea and grape juice, adds grape juice, melon liquor, blue curacao, grenadine, poisonous wine. rebalances absinthe, and places it within the vendor.
2013-10-21 07:11:40 -04:00
Nanai
219fac680d
Changes the vending machine to account for new drinks, adds grape juice to the juicer.
2013-10-21 07:09:46 -04:00
