Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
Kilakk
15f3e063ab
Added a new destination tagger sprite
2013-10-27 22:57:40 -04:00
DJSnapshot
f020959710
Merge pull request #3833 from Nanai/dev
...
Cyborg Alt Titles
2013-10-27 17:34:35 -07:00
Nanai
87ac3c28f0
Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now.
2013-10-27 20:23:01 -04:00
DJSnapshot
6eedc4eb3f
Merge pull request #3832 from Nanai/dev
...
Custom item fixes, Supermatter Crates.
2013-10-27 16:21:10 -07:00
Nanai
e4e1c66d4a
Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.
2013-10-27 19:17:45 -04:00
DJSnapshot
a2ed948ae4
Merge pull request #3831 from Nanai/dev
...
Guide/Manual addition, sprite fix!
2013-10-27 15:35:33 -07:00
Mloc
979cf24ed7
Merge pull request #3823 from Iamgoofball/boozetaketwo
...
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
2013-10-27 15:29:52 -07:00
Nanai
ba15537f6b
Added two new manuals by MagmaRam to the default engineering manual bookcase.
2013-10-27 18:25:25 -04:00
Iamgoofball
3fa88bb7ff
Fixed beakers not going into DNA scannners.
2013-10-27 13:13:26 -07:00
Iamgoofball
e58438cae8
Fixed the Glass.dm can_be_placed_into list.
2013-10-27 13:09:12 -07:00
Iamgoofball
7b1dd38d06
Removed a useless variable, and changed the lists modifications to use += and -=
2013-10-26 22:39:41 -07:00
Iamgoofball
f7ad7cbddb
Actually added the new beakers. Yay for git.
2013-10-26 21:57:26 -07:00
Iamgoofball
cfbe1c6ad1
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
2013-10-26 21:52:13 -07:00
Kilakk
aee7286e6f
Merge remote-tracking branch 'upstream/master' into dev
2013-10-27 00:43:57 -04: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
jack-fractal
6ecab0bc36
- implementing Mloc's suggestions.
...
- fixing the changelog
2013-10-11 13:29:33 -04:00
