Commit Graph

260 Commits

Author SHA1 Message Date
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
Ghom
b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
2020-02-13 09:40:22 +01:00
ShadeAware
5afbe44be3 Attempt Numero Dos!
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
necromanceranne
0779b67acc whoops 2020-02-03 15:51:07 +11:00
necromanceranne
07a4515b23 Thankfully I didn't fuck it up this way 2020-02-03 15:03:16 +11:00
Tupinambis
ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
Ghommie
95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
r4d6
1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
r4d6
98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
r4d6
1413990ea2 Fix another TG snowflake variable. 2020-01-16 16:15:54 -05:00
r4d6
a360a89f86 Map Changes 2020-01-16 15:10:57 -05:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
BlackMajor
b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
TrilbySpaceClone
ec0596c404 Update 2019-12-23 18:52:33 -05:00
kevinz000
85ceda474e Merge pull request #10218 from GrayRachnid/ADDS-MINERS
Adds gas miners to all maps.
2019-12-23 00:45:22 -08:00
TrilbySpaceClone
d3a8025675 Wew 2019-12-22 02:17:24 -05:00
Ghommie
3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
GrayRachnid
774d853607 Adds gas miners to all maps. 2019-12-17 01:39:25 -05:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Fermi
18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Fermi
ff7b070fa1 Maps 2019-11-21 02:16:15 +00:00
Persi
1f2a32b94d Adds two VR sleepers to all current maps' perma. 2019-11-13 00:49:50 -05:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
Fermi
489e711b4f pls 2019-10-11 18:49:30 +01:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
Poojawa
27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05:00
Sishen
f3d373a6b8 loose goose
honk honk
2019-10-02 02:27:30 -04:00
Chayse Ramsay
986ac16b93 Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps 2019-10-01 22:21:32 +01:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
TrilbySpaceClone
54f3934f55 step to pixel 2019-07-29 12:50:13 -04:00
TrilbySpaceClone
d610d9e4eb green man told me to 2019-07-29 12:16:58 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58
d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
kevinz000
a9738e0790 Merge pull request #8819 from Sishen1542/publiclathe
All maps in rotation now have a public autolathe.
2019-07-07 02:44:32 -07:00
Sishen
e76954455c fixed lathes 2019-07-03 17:21:05 -04:00
Linzolle
52a6201f41 oops 2019-07-01 02:24:12 -05:00
Linzolle
5577014d10 i'm dumb 2019-07-01 02:19:30 -05:00
Linzolle
42a5f4ac9f fixes supply display being on the ground 2019-07-01 01:43:35 -05:00