Commit Graph

222 Commits

Author SHA1 Message Date
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
Fermi 489e711b4f pls 2019-10-11 18:49:30 +01: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
nik707 b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-07 18:23:23 -05:00
EmeraldSundisk 6fc2373a58 Adds some potted plants. 2019-10-07 12:59:43 -07:00
Poojawa 27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05: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
kevinz000 076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
Poojawa 583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00
EmeraldSundisk 68315657f5 Who left those earmuffs out anyway? 2019-08-28 11:15:45 -07:00
Sishen f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Chaz 6eb887bb17 I really hope this works this time. 2019-08-07 17:01:55 -07: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
Sishen 97241cd1e8 jetpacks, take 2 2019-06-29 00:29:49 -04:00
Sishen 8cd14ea48a Update BoxStation.dmm 2019-06-26 15:06:38 -04:00
Sishen e3af8a1a6b Update BoxStation.dmm 2019-06-26 14:50:48 -04:00
Ghommie 9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
Sishen 21c678736b crewmonitor 2019-05-27 22:46:28 -04:00
kevinz000 4be6b352e0 Merge pull request #8423 from Sishen1542/EngiShower3
Engineering Showers! (Fixed 4 REALZIES this time)
2019-05-27 03:31:16 -07:00
Sishen 92bbe42337 FOUR TRIES? IT TOOK HIM FOUR TRIES?! 2019-05-24 07:41:18 -04:00
Poojawa ab2457d504 Large Maps given an Apothecary 2019-05-21 06:09:10 -05:00
Poojawa 2f4e19bb87 Cryopod mapping fixes
Directional pods are also a thing too, neat.
2019-05-16 11:19:49 -05:00
deathride58 4abdaa142f Makes the holodeck control room on boxstation compliant with space OSHA 2019-02-28 22:00:35 -05:00
Tupinambis 4d644153d2 Adds Cryobeds to perma 2018-10-19 20:12:51 -05:00
nik707 dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -05:00
Poojawa c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa 8a71a710dd One more, for the people in the back now y'all 2018-09-11 12:30:27 -05:00
Poojawa 1d5c52ddf8 shit ain't pretty, but whatever cleaned 2018-09-11 12:01:21 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
nik707 6e087876e5 makes atmos more secure (#7513) 2018-08-31 12:41:37 -07:00
deathride58 c285261134 Merge pull request #7484 from nik707/boxchanges
changes maint areas near sec
2018-08-23 03:41:29 -04:00
Tupinambis a1bd981c7c Improves toxins by unbolting toxin chamber doors, and leaving the toxins air alarm unlocked at round start. Move pipes to a less obstructive location. Adds bomb hardsuit to box. (#7473) 2018-08-23 00:26:05 -07:00
nik707 f76127ffc2 changes maint areas near sec 2018-08-21 03:21:59 -05:00
Letter N 958249ba03 boxboxbox 2018-07-07 22:00:46 +08:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Cw 3040 27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00