Commit Graph

666 Commits

Author SHA1 Message Date
kevinz000
823b14e1e4 Merge pull request #8921 from Trilbyspaceclone/Runtimestation_update
Updates RuntimeStation bugtesting map to be more usefull
2019-07-29 05:46:07 -07:00
kevinz000
c1c30c0f93 Merge pull request #8945 from Ghommie/Ghommie-cit155
Pubby disposal and lawyer spawner fixes.
2019-07-29 05:05:23 -07:00
Ghommie
4e62e076c8 fixes. 2019-07-22 12:30:07 +02:00
Ghommie
147b1144fd adding a second lawyer spawner to pubby. 2019-07-22 12:12:28 +02:00
Ghommie
5581849bfb Fixex Pubby Disposal. 2019-07-22 11:46:56 +02:00
Ghommie
fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
TrilbySpaceClone
b578cc4db1 more uptodate 2019-07-17 20:59:06 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +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
Ghommie
9600f66c47 Adding one pAI to the wizard shuttle and ERT prep rooms. 2019-07-07 23:56:35 +02: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
84f0554fc1 ai display was on the ground too 2019-07-03 16:02:53 -05: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
Ghommie
a2d896351b Sort of porting "Changes the type pathing of some "random" items" 2019-06-23 07:10:11 +02:00
Sishen
054ec6e710 Update PubbyStation.dmm 2019-06-21 21:38:53 -04: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
BurgerLua
3968213bde Increased the spawn area size of the City of Cogs 2019-04-22 12:04:21 -07:00
deathride58
64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
deathride58
4abdaa142f Makes the holodeck control room on boxstation compliant with space OSHA 2019-02-28 22:00:35 -05:00
nik707
8e8d77d4c4 Merge pull request #7776 from Tupinambis/OmegaTextureFix
Replaces all missing texture turf on Omega Station with sandy plating as was intended.
2018-11-30 21:50:04 -06:00
Tupinambis
861dd61fe9 Adds a mixed closet to Delta Dorms, and a bottle of unstable mutagen to Botany. (#7772) 2018-11-28 19:48:37 -08:00
Tupinambis
18bc815b55 Replaces all missing textures with sandy plating as was intended. 2018-11-28 16:37:02 -06:00
Tupinambis
e45fde5fa0 Ensures the air injectors in toxins and more importantly the SM engine actually function. 2018-11-18 17:01:16 -06:00
Tupinambis
addda0398f Tesla died for our sins. 2018-11-11 20:04:22 -06:00
Tupinambis
4d644153d2 Adds Cryobeds to perma 2018-10-19 20:12:51 -05:00
deathride58
31ba174020 Merge pull request #7630 from Tupinambis/NukeOpsStart
The cooler nuke op base (featuring more air)
2018-10-10 02:03:02 -04:00
nik707
dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -05:00
Tupinambis
0b097338fa Please for the love of fuck remove cit map files or triple gay. 2018-10-06 21:26:19 -05:00
Tupinambis
10a887995f Makes the nuke op base cooler and more immersive and such. Enjoy 2018-10-06 19:56:25 -05:00
Poojawa
854dbc81c5 fixes the stragglers of Pubby
See, I knew I didn't get them all.
2018-09-21 03:26:54 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
686f7395c8 some other pubby tile fixes 2018-09-20 05:43:13 -05:00
Poojawa
e7323cdf71 whatever 2018-09-20 05:26:33 -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
4febd4aef0 comma boy kindly go the fuck away. 2018-09-11 12:19:18 -05:00
Poojawa
91fbd61e15 this is why you don't hand edit 2018-09-11 12:10:06 -05:00