Commit Graph

987 Commits

Author SHA1 Message Date
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
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
nik707
df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox
Adds a gun range to Box Station.
2019-09-02 18:23:48 -05:00
EmeraldSundisk
4f5e9893b3 Requested changes. 2019-08-29 19:32:32 -07:00
EmeraldSundisk
4da0556bb1 Driver should work now! 2019-08-28 18:29:28 -07:00
EmeraldSundisk
68315657f5 Who left those earmuffs out anyway? 2019-08-28 11:15:45 -07:00
EmeraldSundisk
ac1e058d1c Some minor fixes. 2019-08-28 10:08:12 -07:00
kevinz000
d696c2cf6b Merge pull request #9169 from EmeraldSundisk/delta2chapel
Adds a holy driver to Delta Station.
2019-08-26 19:37:17 -07:00
EmeraldSundisk
1adc70bc81 Hope it's ready this time! 2019-08-20 20:48:56 -07:00
Chaz
5b4565276d Driver. 2019-08-20 07:43:11 -07:00
BlackMajor
1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up
Fixes missing air in Gas the Lizards in the freezer/surgery
2019-08-19 20:02:26 +12:00
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
Sishen
3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Sishen
0693f27010 Update lavaland_surface_ash_walker1.dmm 2019-08-09 03:43:55 -04: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
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
nik707
c9c4c5678c missed a few things 2019-08-03 18:31:47 -05:00
nik707
1af6445fa6 Update PubbyStation.dmm 2019-08-03 18:17:28 -05:00
nik707
20ce72ca9e Update PubbyStation.dmm 2019-08-03 18:16:14 -05:00
nik707
ba78ec7100 yes 2019-08-03 17:41:12 -05: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
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
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08: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
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00
kevinz000
94d92f7b1b Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
2019-06-23 06:49:37 -07:00
kevinz000
f34d850d77 Merge pull request #8716 from Sishen1542/pubbyfix
Replaces medical protolathe with medical techfab on Pubbystation.
2019-06-23 06:08:00 -07:00
Trilbyspaceclone
51e4ac0f67 fixes plant disk design and hacked autolathen (#8674)
* fixes plant disk design and hacked autolathen

* Update lavaland_surface_seed_vault.dmm
2019-06-23 05:59:19 -07:00