cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,904 Commits 6 Branches 0 Tags
e3d19eceab7f33d70b5d5484a2fa2f07dd8cb635
Commit Graph

11077 Commits

Author SHA1 Message Date
Chinsky
e3d19eceab Updated paths for smoke generator 2013-11-06 22:44:56 +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
Chinsky
35f262c137 Merge pull request #3871 from Mloc/fun 
SDQL and SQDL 2 from Lunacode.
 2013-11-04 13:30:24 -08: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
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
37fbf3848a Uses fancy new 501 blendmodes to make fire alarms look fancier. 
See: http://i.imgur.com/GLzdBfv.gif

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-04 14:01:28 +00:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Chinsky
6152644155 Merge pull request #3868 from DJSnapshot/master 
Devs are speshul snoflakes too.
 2013-11-03 19:19:36 -08:00
DJSnapshot
6ef89ef868 Devs are speshul snoflakes too. 2013-11-03 19:18:33 -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
Mloc
64ca8fb853 Merge pull request #3865 from DJSnapshot/master 
Fixed delay so anyone with R_SERVER can use it.
 2013-11-03 13:33:05 -08:00
DJSnapshot
11f0b1ef92 Fixed delay so anyone with R_SERVER can use it. 2013-11-03 13:31:54 -08:00
Mloc
ad9139304d Merge pull request #3864 from comma/master 
VG ZAS Fire stolen
 2013-11-03 08:33:03 -08:00
Chinsky
a210c1b613 derp XOR 2013-11-03 20:31:50 +04:00
Chinsky
8274114e47 VG ZAS Fire stolen 2013-11-03 20:28:26 +04:00
DJSnapshot
acc94c6f85 Fix for auto-transfer being called every 10 minutes after the first 3 hours. 2013-11-02 18:11:09 -07: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
Mloc-Argent
593c10d9f5 Fix for trace_gases getting massive and killing the server. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-02 21:30:44 +00: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
DJSnapshot
69389d392c Fix for https://github.com/Baystation12/Baystation12/issues/3813 2013-11-02 11:45:26 -07:00
Iamgoofball
989c8b69c5 Fixed Copypasta again! 
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
 2013-11-02 11:36:14 -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
Mloc
93530a3ac4 Merge pull request #3850 from DJSnapshot/master 
end of 2spookyday event
 2013-11-01 08:03:11 -07:00
DJSnapshot
78055b44a8 Used multi-line comments instead because Mloc and Chinsky didn't like me cheating DM for less characters. 2013-11-01 08:00:38 -07:00
DJSnapshot
13cb84f620 end of 2spookyday event 2013-11-01 07:30: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
Mloc-Argent
ff5e2496aa Fix for air alarms doing weird things on zones with low amounts of air. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-28 23:27:04 +00: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