Commit Graph

27049 Commits

Author SHA1 Message Date
r4d6 3524bc24ea Fix areas and tiles getting ripped off 2019-12-22 17:04:08 -05:00
r4d6 b53c3869ca Connect the fuel pipe to somewhere 2019-12-22 08:19:23 -05:00
r4d6 aa0507dc03 Forgot a button on the Tesla 2019-12-21 23:46:12 -05:00
r4d6 04f0496322 Forgot a " 2019-12-21 23:23:32 -05:00
r4d6 5a189b2354 QoL Update
- Rename the cameras and place two more

- Unanchor the shields generators and emitters because they were bugged and will save more time

- Put more rad closets on the Singulo

- Put more insuls on the Tesla since they protect

- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine

- Added a button to the shutters on the north side of PA

- Added a marker to show where to place the console

- Rewire the power wire to be more in a straight line.
2019-12-21 23:09:43 -05:00
r4d6 84d99c8fe8 Fix indentation 2019-12-21 15:00:53 -05:00
r4d6 383e09651f Suggestions 2019-12-21 14:55:37 -05:00
r4d6 c5aef98252 Make things even more organized 2019-12-21 09:17:15 -05:00
r4d6 fb078e18f9 QoL Update
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
2019-12-21 09:12:04 -05:00
r4d6 445a7fb855 Redo my changes on Box
Hopefully this will fix the conflict with the fire alarms.
2019-12-19 23:57:49 -05:00
r4d6 61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
Lin 4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
CitadelStationBot 702aff08c4 Automatic changelog generation for PR #10214 [ci skip] 2019-12-19 17:42:09 -06:00
Lin 8d54e8afcc Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
2019-12-19 23:42:06 +00:00
CitadelStationBot 1e7e66b8c5 Automatic changelog generation for PR #10207 [ci skip] 2019-12-19 17:41:40 -06:00
Lin f38747ed70 Merge pull request #10207 from Ghommie/Ghommie-cit468
Fixes pubby wall meds being var-edited snowflakes.
2019-12-19 23:41:36 +00:00
Lin 8511c44f0f Merge pull request #10199 from Ghommie/Ghommie-cit467
Fixing and cleaning up the blood bank generator code.
2019-12-19 23:39:17 +00:00
CitadelStationBot d9002bbe8b Automatic changelog generation for PR #10079 [ci skip] 2019-12-19 17:26:56 -06:00
Lin 138b460af3 Merge pull request #10079 from Ghommie/Ghommie-cit438
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
2019-12-19 23:26:53 +00:00
Lin 3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390
Unmodularize gamemodes folder.
2019-12-19 23:23:20 +00:00
Lin 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
CitadelStationBot 73a0976d4e Automatic changelog generation for PR #10160 [ci skip] 2019-12-19 17:00:55 -06:00
Lin 66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
CitadelStationBot 53abbbaf85 Automatic changelog generation for PR #10067 [ci skip] 2019-12-19 16:03:25 -06:00
nik707 c1be6ba222 Merge pull request #10067 from Sishen1542/botnayn
You can change a plant's name, description and its seed's description by using a pen on the seed
2019-12-19 16:03:22 -06:00
r4d6 88d57cd879 Make it include my files 2019-12-19 15:37:02 -05:00
r4d6 44592fe03f Add the sprite for the landmark 2019-12-19 15:36:10 -05:00
r4d6 df05788f0e Merge pull request #1 from r4d6/master
Wrong branch
2019-12-19 15:35:08 -05:00
r4d6 4608b3852d Add the file for making the submaps actual ruins 2019-12-19 15:28:46 -05:00
r4d6 dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05:00
r4d6 22d89a9435 Add the stuff to seed the station with rooms 2019-12-19 15:26:43 -05:00
r4d6 9672f98de3 Fix a possible alert 2019-12-19 15:24:56 -05:00
r4d6 ac1719810f Adding a list for the stations rooms 2019-12-19 15:23:23 -05:00
r4d6 ffdfa5c409 Update Boxstation to have Engines landmark 2019-12-19 15:21:36 -05:00
r4d6 8a4b3f2681 Add Engines submaps 2019-12-19 15:20:32 -05:00
CitadelStationBot f4cbc986da Automatic changelog generation for PR #10090 [ci skip] 2019-12-19 14:11:30 -06:00
nik707 63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
2019-12-19 14:11:27 -06:00
nik707 dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
2019-12-19 14:10:18 -06:00
kevinz000 e8e97021b3 Merge pull request #10229 from B1gb3ast/master
Fixes nonfunctional code so that tongues can taste strong flavors
2019-12-19 04:06:07 -07:00
CitadelStationBot 06b38d0263 Automatic changelog generation for PR #10204 [ci skip] 2019-12-19 05:01:55 -06:00
kevinz000 23f7815c52 Merge pull request #10204 from r4d6/patch-2
Port boops and handshakes
2019-12-19 04:01:52 -07:00
kevinz000 dcca9eb0d6 Merge pull request #10223 from BlackMajor/Yeehaw
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
2019-12-19 03:24:36 -07:00
B1gb3ast 21c77cbdf1 modular man bad.
now mörge this so chefs can make delicious dish, hemk.
2019-12-18 23:36:32 +01:00
B1gb3ast d011a7a3d9 oh hey macros.
slightly less ugly ™
2019-12-18 19:35:36 +01:00
B1gb3ast 19b20f8385 im baby dumb and removed "a hint of" by accident.
Okay whoops haha there we go now both strong and weak should work.
2019-12-18 19:29:57 +01:00
B1gb3ast 7841faa3a9 Actually hold on
So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.
2019-12-18 19:24:25 +01:00
Ghommie f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 2019-12-18 19:20:38 +01:00
CitadelStationBot 5be981e026 Automatic changelog generation for PR #10228 [ci skip] 2019-12-18 10:39:11 -06:00
kevinz000 cdb26e4916 Merge pull request #10228 from Putnam3145/quirk-fix
fixes quirks (again)
2019-12-18 09:39:08 -07:00
B1gb3ast 84a413a43a Chef buffs chef buffs tastier food.
"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! 
Hurrah!
2019-12-18 17:37:08 +01:00