Kilakk
1ed2ea6ec2
Fiddling with cooldown times
2013-10-26 13:35:31 -04:00
Kilakk
2aae632786
Added the ability to send faxes between departments
2013-10-26 13:21:56 -04:00
Nanai
c9d8fa15ab
Del rework, as requested.
2013-10-24 18:25:36 -04:00
Nanai
c9dea9b89d
New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu!
2013-10-24 15:47:26 -04: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
Chinsky
88f7a48434
Merge pull request #3800 from Segrain/dev
...
Dev update.
2013-10-21 03:04:27 -07: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
8bd055357a
Same fix again.
2013-10-21 04:48:07 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Nanai
137cbba8e4
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:38:26 -04:00
Nanai
461794c662
Cloning pod altered to hold 3 clones worth of biomass at roundstart.
2013-10-20 17:07:02 -04:00
ZekeSulastin
28d546f2b1
Added dialysis volume. Also numbness message for entering.
2013-10-19 17:03:13 -04: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
ZekeSulastin
0df64f898c
Added dialysis to sleepers
...
Rapidly removes reagents from patient at the cost of blood.
Ported from Jamini's NEV Unity codebase.
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
Mloc
98caca85f0
Merge pull request #3785 from comma/dev
...
Some fixes
2013-10-19 03:56:29 -07:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
jack-fractal
3732a9c3b9
Adding the dispensers to the cargo lists.
...
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
2013-10-17 19:48:57 -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
Chinsky
dcde181bee
SOMEONE did not put surgery things on new clickcode, so I done that.
2013-10-16 17:14:09 +04:00
Mloc
90378111e1
Fixes #3777
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-10-16 11:21:51 +01:00
Chinsky
930a30cfd0
Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file
2013-10-16 12:51:30 +04:00
Chinsky
55ea60a785
Fixed derpy type of psych couch
2013-10-16 12:50:40 +04:00
Chinsky
f3028d3edd
Attempted fix #3769
...
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
2013-10-16 11:28:41 +04: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
Chinsky
6a2c91196a
Merge pull request #3771 from Mloc/newzasfix
...
Small work on making zones wake up on geometry changes.
2013-10-14 02:12:12 -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
Segrain
14ee1bccbb
Fix for #3770 .
2013-10-13 23:04:46 +03:00
Mloc-Argent
24994ec752
Small work on making zones wake up on geometry changes.
...
Also added sleeping for zones with unsimulated tiles; unfortunately it probably won't happen for ages due to a dichotomy paradox.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-13 19:44:12 +01:00
