63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
7ffafb657e
Fix for acid pouring.
2013-10-27 21:56:08 +03:00
93cfba21a7
Fix for #3826 .
2013-10-27 21:55:08 +03:00
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
6cf485deae
Quickfix.
2013-10-24 19:13:05 +03:00
c8fcabc181
Smallfix.
2013-10-24 19:11:04 +03:00
d8f0c43be1
Merge remote-tracking branch 'upstream/master' into dev-freeze
2013-10-24 19:02:56 +03:00
5698addc75
Code cleanup.
2013-10-24 09:54:15 +03:00
74f898a1a2
Merge pull request #3809 from DJSnapshot/antag
...
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
5f7ee54430
Fix for sunglasses and night vision goggles
2013-10-23 19:51:01 -07:00
1488850ad1
Merge pull request #3803 from Nanai/dev
...
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
50f2f0ae46
Removes pin necessity on vending machines.
2013-10-21 07:12:23 -04:00
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
4d79764478
Vox wallets.
2013-10-21 05:13:09 +03:00
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
188e68feb8
Money spawning.
2013-10-21 05:06:46 +03:00
9a662594f2
Cash money.
2013-10-21 05:04:45 +03:00
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
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
752f9f80eb
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu
2013-10-19 13:13:02 -04:00
cad425f2ca
Roundend declaration.
2013-10-17 04:07:29 +03:00
6184ad729f
Cardfix.
2013-10-17 04:01:46 +03:00
da96d45bc0
Smallfix.
2013-10-17 04:00:33 +03:00
6ece0850af
Volume fix.
2013-10-17 03:53:03 +03:00
1d1d611087
Quillsfix.
2013-10-17 03:51:56 +03:00
90378111e1
Fixes #3777
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-16 11:21:51 +01:00
a7be4d9353
Fixes #3781
...
Magical thingies now go zzap instead of click click when empty.
2013-10-16 11:06:43 +04:00
ac7aae7358
Fixed #3776
...
Missed update_body calls
2013-10-16 10:57:19 +04:00
4b8621bcef
Temporary patch so aliums can use magboots until the hardsuit rework gets merged.
2013-10-15 23:06:02 -07:00
d85940ff3b
Merge pull request #3775 from DJSnapshot/adminfeatures
...
expanded mod powers
2013-10-15 00:24:39 -07:00
3d83eafbae
teensy spot missed.
2013-10-15 00:19:34 -07:00
8af4d1eadf
Fixed random git bug
2013-10-15 00:14:21 -07:00
41377d4122
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-10-15 10:59:06 +04:00
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
c7821741c2
Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging.
2013-10-14 23:48:26 -07:00
87037847ce
Merge pull request #3773 from Aranclanos/EmitterBeams
...
Duplicates the speed of the gameticker!
2013-10-13 14:06:03 -07:00
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
e285ffd698
Fixed respawn timer issues
2013-10-13 10:35:15 -04:00
bcba722bbd
Fix for #3763 .
2013-10-13 03:44:17 +03:00
f725215857
Missing verbs.
2013-10-13 03:43:06 +03:00
fb0fb4da6a
Merge pull request #3759 from Baystation12/dev-freeze
...
freeze -> dev
2013-10-11 11:41:06 -07:00
6ecab0bc36
- implementing Mloc's suggestions.
...
- fixing the changelog
2013-10-11 13:29:33 -04:00
32c3f27675
* adding a 'rejuvinate' function to organs that fixes all types of damage
...
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
367c1cf4f4
Better check.
2013-10-11 11:10:27 +03:00
3d6791df81
Fix for pockets.
2013-10-11 10:22:58 +03:00
775d723f68
Typecheck.
2013-10-11 10:21:14 +03:00
464fc22fa5
Missing verb.
2013-10-11 10:18:43 +03:00
17f38e109d
Missing language.
2013-10-11 10:16:46 +03:00
8be67352ea
Typo fix.
2013-10-11 10:16:00 +03:00
DJSnapshot