Chinsky
ba63c5a1bc
Removed overlays_lying.
...
Now all that shit is done by fancy transformations, client-side.
2013-11-06 22:45:32 +04:00
Chinsky
e3d19eceab
Updated paths for smoke generator
2013-11-06 22:44:56 +04:00
Iamgoofball
60e73bc9ac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo
2013-11-05 11:44:37 -08:00
Mloc
2eb98fd86e
Merge pull request #3879 from comma/master
...
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4
derp
2013-11-05 03:17:44 +04:00
Chinsky
65c248cda0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma
2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Mloc-Argent
8005d8bf2b
More power to devs. (this is a bad idea)
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-04 21:31:29 +00:00
Iamgoofball
ec90e5b3c4
Fixed worldloop issues.
2013-11-04 13:19:26 -08:00
Iamgoofball
ee50a26a6b
Removed Fart event, fixed copypasta x999, added the telepads to the machines list.
2013-11-04 13:16:00 -08:00
Mloc
68f796b572
Merge pull request #3874 from comma/master
...
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00
GC's virus dummies #whoa #derp
2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328
Dun goofed
2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095
Another uncommented log debug line.
2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f
Fix so bans can work again.
2013-11-04 13:07:03 -08:00
Iamgoofball
d4fc17c77a
Fixes an issue where the teleporter can malfunction while calibrated.
2013-11-04 12:32:10 -08:00
Mloc-Argent
4ef079aba3
SDQL and SQDL 2 from Lunacode.
...
SQL syntax things for datums. 'UPDATE /obj IN world SET color = "pink"'
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-04 16:16:53 +00:00
Mloc-Argent
f1b230edc4
Merge branch 'master' into dev
2013-11-04 10:46:13 +00:00
Iamgoofball
cfdb0a65a7
made some stuff sooper dooper hard to get
2013-11-03 22:09:31 -08:00
Iamgoofball
4b6ea531a4
text issue regarding \red.
2013-11-03 22:06:02 -08:00
Iamgoofball
e4a2936e2b
Added Telescience! Moves Misc. Research to the spot between the Solars and Xenobio.
2013-11-03 21:49:09 -08:00
Chinsky
8c69e3d8b7
derp
2013-11-04 05:53:10 +04:00
Chinsky
6a235716f8
Merge branch 'master' into dev
2013-11-04 05:38:46 +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
2f4812c183
Merge pull request #3861 from Iamgoofball/boozetaketwo
...
Three booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 16:05:10 -07:00
Iamgoofball
2c30455b10
Grammar tango, spotted and eliminated.
2013-11-02 15:33:22 -07:00
Iamgoofball
ca741fbdd7
Two booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list.
2013-11-02 15:09:04 -07:00
jack-fractal
b9f9e8a16f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-11-02 16:57:48 -04:00
Mloc
73e6311612
Merge pull request #3859 from comma/dev
...
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 12:54:57 -07:00
Chinsky
d779253ba1
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 23:53:23 +04:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
3677121b51
2013-11-01 18:53:45 -07:00
Kilakk
9b540474f3
Changed the embed check to use its own var instead of checking damagetype
...
* var/embed = 0
* The bullets the detective's revoler uses (weakbullet) will no longer embed into anything.
2013-10-31 22:05:58 -04:00
Nanai
7b5d08e48f
Small fix for head reattachment surgery.
2013-10-30 17:20:18 -04:00
Nanai
31a4c61f0f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-10-30 17:15:31 -04:00
Nanai
81632df611
Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim.
2013-10-30 17:12:42 -04:00
Cael Aislinn
4988c6f7e5
resolves issues with artifact location
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-30 15:36:56 +10:00
DJSnapshot
39387fa3bb
Merge pull request #3840 from MDReckless/dev
...
Grape Soda addition
2013-10-29 17:06:16 -07:00
DJSnapshot
8bb22f7e18
Merge pull request #3846 from Iamgoofball/boozetaketwo
...
Fixed a CATASTROPHIC GAME-CHANGING BUG with the Soda Dispenser that resulted in much immersuhan breaking: Grape Soda wasn't in the Soda Dispenser dispensable reagents list.
2013-10-29 17:03:54 -07:00
Iamgoofball
a4737f3b22
Added GRAPE DRANK to the Soda Dispenser.
2013-10-29 16:56:50 -07:00
Cael Aislinn
d19b9bc3b7
fixes the issue with coolant being ineffective
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 22:27:23 +10:00
DJSnapshot
730c406015
Merge pull request #3839 from caelaislinn/xenoarchaeology
...
Xenoarchaeology updates
2013-10-28 22:36:08 -07:00
Nanai
ff6c2767b8
Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim.
2013-10-29 01:02:35 -04:00
DJSnapshot
fe6fda9e46
Merge pull request #3837 from Nanai/dev
...
Decapitation Fixes, Head Reattachment Surgery
2013-10-28 14:01:04 -07:00
MDReckless
5a8a629df7
Update drinkingglass.dm
2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255
tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:33:23 +10:00
