cb17ea4874
More Active Turf Fixes
...
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
dcf3155b7f
Map Edits Three: The Mappening
...
Fixes active turfs in wizard ruin that spawns in lavaland and ones on the space hermit asteroid. Fixes delta missing APC's for botany, the pool, and the little lounge area before toxin's testing site. And a light to the server room so it's not pitch black in there.
2020-07-30 16:29:04 -06:00
8fbdc6257c
Update listeningstation.dmm
...
it's a fan
2020-07-26 18:26:52 -06:00
267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
562b57095d
mowing down the experimental cloner copypasta.
2020-07-05 03:04:53 +02:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
aff4e5f93f
Linter fixes
2020-06-22 17:58:52 +03:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
da772b9cb7
Adds the "Space Diner" space ruin. ( #12337 )
...
* Create spacediner.dmm
* Update spacediner.dmm
* Update spacediner.dmm
* Conversion.
* Adds the beacon and APC.
2020-05-24 13:11:49 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
ab3ed7f9c2
Space Hermit Ruin fixes.
2020-04-11 23:27:19 +02:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
ab7fc2dc72
me and the boys stealing prs ( #11517 )
...
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
2020-03-19 13:38:31 +01:00
ca6341aac4
Merge branch 'master' into SpaceRuins
2020-02-24 19:47:52 +13:00
984b57560b
Fixes cults being able to summon at ruins. As well as stops the ash storm sound.
2020-02-21 01:39:16 +13:00
aff71e7f14
Initial Commit. Adds space ruins to station z.
2020-02-17 23:44:06 +13:00
55fa48737e
Forgot about not versioned files.
2020-02-02 01:28:16 +01:00
7837688426
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-28 23:41:10 +01:00
e0caf6007b
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter...
2019-12-07 04:02:33 +01:00
9f00423bbd
Fixing the deep space gorilla.
2019-10-29 21:51:00 +01:00
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
969bc83179
Merge pull request #9586 from BlackMajor/Yeehaw
...
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
8b61fe3d72
posibrains on spawn list
2019-10-23 22:46:10 +13:00
f843a53fe9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-24 12:52:16 +02:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
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
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
23e3263fcb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-08 04:46:54 +02:00
aea2f6f523
Merge pull request #8900 from Seris02/spaceruinsyee
...
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
72413c893f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-07-27 01:38:20 +02:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
59f45d3e35
adds abductor replication lab with advanced tools
2019-07-15 15:18:04 +08:00
28d3747c5e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-06-24 16:55:10 +02:00
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
94d92f7b1b
Merge pull request #8664 from BlackMajor/MeMapGood
...
Adds another space ruin
2019-06-23 06:49:37 -07:00
50dd512be7
Ports system for randomized semi-persistent chem reactions.
2019-06-17 10:50:40 +02:00
1060bb05b4
Space hermit ruin
2019-06-17 17:41:46 +12:00
27333276de
Merge pull request #8570 from Trilbyspaceclone/patch-170
...
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
d9119d43f0
Merge pull request #8627 from BlackMajor/MeMapGood
...
Adds more space ruins.
2019-06-16 19:29:23 -07:00
ba3a2c00bb
ports in the Hilbert's Hotel.
2019-06-16 10:50:59 +02:00
dapnee