shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

17225 Commits

Author SHA1 Message Date
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
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05: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
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
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
Lin
66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +00: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
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
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
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
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
Putnam
114026f9ae argk 2019-12-18 02:40:51 -08:00
Putnam
3dbf813817 probably fixes only neutral traits existing 2019-12-17 22:34:28 -08:00
Putnam3145
6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity 
make unable to carry fireman message more clear when unable to carry non-humans
 2019-12-17 12:09:08 -08:00
Putnam3145
c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437 
Fixes alien tech node not being unlockable with subtypes of the accepted items.
 2019-12-17 11:58:39 -08:00
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Putnam3145
7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 
Porting a few martial art code updates.
 2019-12-17 11:47:19 -08:00
Putnam3145
37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -08:00
Putnam3145
7a6541936c Merge pull request #10111 from kappa-sama/patch-11 
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
 2019-12-17 11:38:35 -08:00
Putnam3145
0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Putnam3145
634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Putnam3145
10f0fa6868 Merge pull request #10203 from DeltaFire15/mechaccess 
Nukies and deathsquaddies can now finally fix their mechs internal fires
 2019-12-17 11:32:56 -08:00
Putnam3145
670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
 2019-12-17 11:26:36 -08:00
Putnam3145
5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475 
Two slimepeople fixes.
 2019-12-17 11:22:30 -08:00
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
Ghommie
f2cf146255 Two slimepeople fixes. 2019-12-17 12:49:04 +01:00
BlackMajor
5245898c25 whoops 2019-12-17 23:46:15 +13:00
BlackMajor
03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie
3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Lin
6f70ba1477 Merge pull request #10181 from Ghommie/Ghommie-cit463 
Fixing a few pill bottle issues with the ChemMaster.
 2019-12-17 01:08:27 +00:00
Lin
237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462 
[s] virtual reality component improvements, fixes and documentation.
 2019-12-17 01:05:10 +00:00