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,630 Commits 8 Branches 0 Tags
1ba49d17cb8df1a22c596e3235f2da9066b758c3
Commit Graph

10238 Commits

Author SHA1 Message Date
Kilakk
1ba49d17cb Made it so auto- and admin-ERT crosscheck each other 
This avoids having an admin call an ERT and then having the auto call
a second ERT on its own

Also added a check to abort ERT if not enough people sign up (members_required is currently 1)
 2013-07-22 16:53:48 -04:00
Kilakk
8766e4154d Changed the list of p_stats available in medical records 
Made it so removing an ID card from the medical computer puts the ID into your hand rather than onto the computer

List:
Active, *SSD*, *Deceased*, Physically Unfit, Disabled
 2013-07-22 15:10:25 -04:00
Mloc-Argent
e7f38be3b4 Beakers and other glass containers now hide their contents, only showing the amount. 
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:38:34 +01:00
Mloc-Argent
8421cd44df Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:37:39 +01:00
Mloc-Argent
bdaabaec46 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-07-22 14:42:50 +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-Argent
8575b7a286 And once again, did that the wrong way around. Whoops. 
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:41:50 +01:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +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
LordBraindead
5d63943d07 Update mineral.dm 
removed sheettpye = "plastic" again because it snuck back in after being removed already
 2013-07-14 21:50:48 +02:00
LordBraindead
53c73f6b85 Update power_cells.dm 
derped a debug message into the commit
 2013-07-14 21:22:09 +02:00
LordBraindead
08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02: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
Mloc-Argent
b5c63c2a66 I have honestly no idea what happened there. Fucking git. 
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:31:26 +01:00
Mloc-Argent
c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Mloc-Argent
66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue" 
This reverts commit 9139a70d8c.
 2013-07-12 12:22:58 +01:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
Zuhayr
6a714f3613 Merge pull request #3300 from Spamcat/master 
meatfix revert
 2013-07-12 01:26:34 -07:00
Spamcat
c27f3efb8e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 03:06:41 +04:00
Spamcat
4ceb12bb1c Revert "Quickfix for INFINIMEAT." 
This reverts commit 654a83be9d.
 2013-07-12 03:03:46 +04:00
Segrain
b5b58e5ebe Runtime error fix. 2013-07-12 00:00:59 +03:00
Segrain
f7b22fa911 Quickfix. 2013-07-11 23:14:56 +03:00
Cael_Aislinn
e4b4486768 added a spawning guide to EFTPOS devices 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:38 +10:00
Cael_Aislinn
4421bede17 moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:06 +10:00
comma
da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro 
Conflicts:
	html/changelog.html
 2013-07-11 02:53:58 +04:00
Chinsky
67cc13751a Derp. 2013-07-11 02:09:01 +04:00
Mloc
e820e28f78 Merge pull request #3292 from comma/master 
Fixes
 2013-07-10 14:36:32 -07:00
comma
47c6901df3 Fixes #3018 
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
 2013-07-11 01:30:16 +04:00
comma
81e22ea270 Fixes wires on air alarm not displaying cut status properly. 
Fixes #3087
 2013-07-11 00:59:44 +04:00
comma
c791208efc Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process. 2013-07-11 00:18:03 +04:00
Spamcat
10b0ef11ab Fixed #3290. 
<_< you saw nothing >_>
 2013-07-10 22:58:23 +04:00
comma
45e775f5e9 Standardized proc definitions in alarm code. 2013-07-10 22:49:10 +04:00
comma
f1cfb96dab Fixes #3225. Adds separate toggle for LOOC. 
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
 2013-07-10 22:39:27 +04:00