cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 5 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

11004 Commits

Author SHA1 Message Date
Zuhayr
bbf241a55b Merge pull request #3349 from Jamini/dev 
Added employment records.
 2013-07-25 04:29:26 -07:00
Segrain
fe0e1ecfb6 Conflict fix? 2013-07-25 09:55:35 +03:00
Kilakk
839d50d18e Fixed a few small issues with admin-ERT 
* ERTs will no longer show up as "unknown" in the traitor panel, deadchat, and at the end of the round, among other places.
* Added update_icons() -> You no longer need to trigger it manually by clicking something
 2013-07-25 00:03:54 -04:00
Jamini
920b855f6c Added employment records. 
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-07-24 22:23:50 -04: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
RusskiSam
df8c6cdbcf Added engineering tape roll to CE closet. 2013-07-24 07:27:06 -07:00
RusskiSam
74f951ed75 HoS and Warden's closets get police tape roll. 
Tape rolls are now available for all security jobs.
 2013-07-24 07:20:31 -07:00
Zuhayr
523b7874e7 Merge pull request #3342 from RusskiSam/dev 
Adds police tape roll to Detective's Cabinet.
 2013-07-23 17:45:23 -07:00
RusskiSam
b3e5bbdc14 Adds police tape roll to Detective's Cabinet. 
Signed-off-by: RusskiSam
 2013-07-24 04:28:03 +04:00
Kilakk
52ac0fdf31 Added crew manfiest verb for ghosts. 
Made the silicon crew manfiest monochrome, because why not?
 2013-07-23 19:11:30 -04: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
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
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
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