cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,410 Commits 8 Branches 0 Tags
e642b3e7e74c1319b51e53ee5b126085225e07f4
Commit Graph

11452 Commits

Author SHA1 Message Date
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
Chinsky
1f110d5a74 Merge pull request #3885 from DJSnapshot/master 
Cleanbot now cleans mucus
 2013-11-05 23:34:44 -08:00
DJSnapshot
3aa8d088bd cleanbot now cleans mucus 2013-11-05 22:24:02 -08:00
Iamgoofball
60e73bc9ac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo 2013-11-05 11:44:37 -08:00
Mloc
d228089601 Merge pull request #3880 from comma/master 
Where can I get my idiot certificate.
 2013-11-04 16:05:07 -08:00
Chinsky
b7edb181ed Where can I get my idiot certificate. 2013-11-05 03:59:39 +04: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
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
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
86ebf818f1 Merge pull request #3872 from comma/master 
Goasts & Spam
 2013-11-04 10:49:07 -08:00
Chinsky
9c6a51b3fb Commens out debuglog spam in side effects 2013-11-04 22:38:55 +04:00
Chinsky
98ba7e4699 Fixes zombie goast tableflips 2013-11-04 22:36:22 +04: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
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
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
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