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
13,595 Commits 8 Branches 0 Tags
c2712dd9d35d87e7d2af2bcda159698ddab30c25
Commit Graph

10197 Commits

Author SHA1 Message Date
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
Segrain
fb4552f394 Fix for #3383. Again. 2013-08-01 17:15:16 +03:00
Segrain
2e2cca058c Fix for #3406. 2013-08-01 17:11:12 +03:00
Segrain
8021250804 Type mismatch fix. 2013-07-31 10:32:19 +03:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
d591c1ef75 Hotfix for EFTPOS and ATM machines not connecting to databases. 2013-07-30 20:26:08 +01:00
Erthilo
9bbf43407f Fixes Gravitational Catapult not detaching. 2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13 Fix for table/computer cross-detection. 2013-07-30 19:13:42 +03:00
Segrain
578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Chinsky
27c1bced7f Merge pull request #3385 from Zuhayr/master 
Taser runtime fix.
 2013-07-29 12:13:22 -07:00
Zuhayr
a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
meyar
1498c5748e Camera's got lost in the shuffle. 2013-07-29 04:34:28 -04:00
meyar
de0c032486 Turns two ERT files into one. Also fixes the ERT admin button being bork. 2013-07-29 03:45:49 -04:00
Zuhayr
ea9078830a Merge pull request #3384 from SkyMarshal/airfixes 
Fixes a bug with heat transfer.
 2013-07-28 19:13:13 -07:00
SkyMarshal
cd72596249 Fixes a bug with heat transfer. 2013-07-28 19:11:05 -07:00
Segrain
fdce68fe66 Magboots fix. 2013-07-28 14:31:23 +03:00
Zuhayr
1670ed8051 Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices. 2013-07-27 01:08:27 -07:00
Zuhayr
37aef47198 Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode. 2013-07-27 00:48:50 -07:00
Zuhayr
c09d07bb82 Added tool steps to manually remove the bolts on a deployed nuclear weapon. 2013-07-27 00:09:19 -07:00
SkyMarshal
72c331bfa7 Several ZAS fixes. 
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections.  (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
 2013-07-25 21:34:12 -07:00
Zuhayr
8124f7bfe7 Merge pull request #3352 from Mloc/zasfixes 
ZAS fix.  It should now be possible to repair breaches without admin int...
 2013-07-25 06:40:21 -07:00
Mloc-Argent
d02d50d0ce ZAS fix. It should now be possible to repair breaches without admin intervention. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-25 14:31:31 +01:00
Segrain
cf4f9ba054 Typo fix, retractor step bugfix. 2013-07-25 03:06:06 +03:00
Segrain
a17e456a97 Defaulting LOOC to being toggled on. 2013-07-25 03:04:28 +03:00
Segrain
85f82219ba Fix for #3345. 2013-07-25 03:03:14 +03:00
Mloc-Argent
2a825e6cca Made most paths in ZAS absolute, for easier searching. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-24 21:13:48 +01:00
Mloc-Argent
09db9f1ff0 Nerfed snoring frequency. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 23:38:49 +01:00
Mloc-Argent
eaf4b7cf49 Absoloutely massive (1 character) fix for virology. Pathogenic incubator radiation now goes down as intended. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 19:48:56 +01:00
Mloc-Argent
c79a501a12 Remove the sound played on airflow, due to intense lag and eight-and-a-half million calls of playsound in an hour. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 16:13:39 +01:00
Zuhayr
15f0853ea2 Merge pull request #3331 from BcTpe4HbIu/airalarm_fix 
Airalarm fix
 2013-07-22 04:04:00 -07:00
Igor Golubkov
3889716dd6 Fix Issue #3327 2013-07-22 10:26:48 +04:00
Igor Golubkov
da14500268 Add error reporting on failed DB connection. 2013-07-22 09:19:19 +04:00
Chinsky
a344010db4 Merge pull request #3330 from Kilakk/master 
Compile fix (read: I'm an idiot)
 2013-07-21 18:50:12 -07:00
Kilakk
d369b9ffff Compile fix (read: I'm an idiot) 2013-07-21 19:49:30 -04:00
Chinsky
f9b6ef3593 Merge pull request #3328 from Mloc/master 
Bugfixes.
 2013-07-21 16:42:29 -07:00
Kilakk
e9483415d3 Fixes #3326 - uncommented admin-ERT verb 2013-07-21 19:38:32 -04:00
Kilakk
afeb753f8e Cleaned up vote oocmute a tad 2013-07-21 19:26:05 -04:00
Mloc-Argent
f0e0951c1c Fixes #3230. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 00:18:24 +01:00
Mloc-Argent
c135d19b66 Partial fix for #2284. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 17:05:10 +01:00
Mloc-Argent
e4b67a3466 Fixes #3104. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 16:55:30 +01:00
Mloc-Argent
eef12bf252 Fixes #3324. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 15:03:49 +01:00
Mloc
2288dc8abf Merge pull request #3318 from SkyMarshal/airfixes 
Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.
 2013-07-14 16:12:53 -07:00
SkyMarshal
46f808edf4 Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring. Should still be verified on the live server before considered resolved. 2013-07-14 16:09:30 -07:00
Zuhayr
07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Zuhayr
7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr
dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -07:00
Zuhayr
71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Mloc
1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00