Chinsky
6d369caae7
Replaces long check with lots of get_organ calls with shorter one.
...
Also changed weird condition that amputated leg must not be splinted.
Removed checks for haslimbs, since movement while downed is not possible anyway.
Moved some special effects for broken limbs after check for such, so healthy ones wont bother.
Fixed a derp in populating the global list of sideffects.
2013-11-08 04:15:49 +04:00
Chinsky
5df1b3c0d4
derp
2013-11-05 03:17:44 +04:00
Chinsky
40e862fe00
GC's virus dummies #whoa #derp
2013-11-05 01:13:49 +04:00
Chinsky
3a425c6095
Another uncommented log debug line.
2013-11-05 01:08:31 +04: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
DJSnapshot
11f0b1ef92
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:31:54 -08:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -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
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
6cf485deae
Quickfix.
2013-10-24 19:13:05 +03:00
Segrain
c8fcabc181
Smallfix.
2013-10-24 19:11:04 +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
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
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
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
Segrain
4d79764478
Vox wallets.
2013-10-21 05:13:09 +03:00
Segrain
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
Segrain
188e68feb8
Money spawning.
2013-10-21 05:06:46 +03:00
Segrain
9a662594f2
Cash money.
2013-10-21 05:04:45 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
ZekeSulastin
3455bf7cc1
Add/remove beaker from sleeper for dialysis
...
Redoes the sleeper attackby() prompt to match cryo's style. Also
removes the millionbeaker in favor of a standard large.
2013-10-19 17:03:13 -04:00
Nanai
752f9f80eb
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu
2013-10-19 13:13:02 -04:00
Segrain
cad425f2ca
Roundend declaration.
2013-10-17 04:07:29 +03:00
Segrain
6184ad729f
Cardfix.
2013-10-17 04:01:46 +03:00
Segrain
da96d45bc0
Smallfix.
2013-10-17 04:00:33 +03:00
Segrain
6ece0850af
Volume fix.
2013-10-17 03:53:03 +03:00
Segrain
1d1d611087
Quillsfix.
2013-10-17 03:51:56 +03:00
Mloc
90378111e1
Fixes #3777
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-16 11:21:51 +01:00
Chinsky
a7be4d9353
Fixes #3781
...
Magical thingies now go zzap instead of click click when empty.
2013-10-16 11:06:43 +04:00
Chinsky
ac7aae7358
Fixed #3776
...
Missed update_body calls
2013-10-16 10:57:19 +04:00
DJSnapshot
4b8621bcef
Temporary patch so aliums can use magboots until the hardsuit rework gets merged.
2013-10-15 23:06:02 -07:00
Chinsky
d85940ff3b
Merge pull request #3775 from DJSnapshot/adminfeatures
...
expanded mod powers
2013-10-15 00:24:39 -07:00
DJSnapshot
3d83eafbae
teensy spot missed.
2013-10-15 00:19:34 -07:00
DJSnapshot
8af4d1eadf
Fixed random git bug
2013-10-15 00:14:21 -07:00
Chinsky
41377d4122
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-10-15 10:59:06 +04:00
Chinsky
7c681b2bd8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/new_player/new_player.dm
2013-10-15 10:56:50 +04:00
DJSnapshot
c7821741c2
Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging.
2013-10-14 23:48:26 -07:00
Mloc
87037847ce
Merge pull request #3773 from Aranclanos/EmitterBeams
...
Duplicates the speed of the gameticker!
2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58
Duplicates the speed of the gameticker!
...
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.
This will add lag due to everything being faster.
2013-10-13 17:11:39 -03:00
Michael Johnson
e285ffd698
Fixed respawn timer issues
2013-10-13 10:35:15 -04:00
Segrain
bcba722bbd
Fix for #3763 .
2013-10-13 03:44:17 +03:00
Segrain
f725215857
Missing verbs.
2013-10-13 03:43:06 +03:00
Chinsky
fb0fb4da6a
Merge pull request #3759 from Baystation12/dev-freeze
...
freeze -> dev
2013-10-11 11:41:06 -07:00
