shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,614 Commits 5 Branches 0 Tags
ee0c436651eade6947fc992fb21660f641917613
Commit Graph

15499 Commits

Author SHA1 Message Date
Ghommie ee0c436651 legs 2019-10-22 09:17:37 +02:00
Ghommie ca1e4b6e65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 2019-10-20 07:29:32 +02:00
Ghommie 8cd93f2085 bad. 2019-10-20 07:28:04 +02:00
kevinz000 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2019-10-19 19:52:21 -07:00
kevinz000 a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
Linzolle b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
Linzolle 3b1e66ad05 more consistent naming 2019-10-17 17:23:47 -05:00
Linzolle 88814415dc tend wounds 2019-10-17 16:59:33 -05:00
kevinz000 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL 
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
 2019-10-17 13:23:33 -07:00
kevinz000 6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem 
nerfs styptic/silversulf/synthflesh to have overdoses
 2019-10-17 13:18:58 -07:00
kevinz000 1cc4ccee0d Merge pull request #9343 from Linzolle/dissection 
port just like a ton of surgery changes from tg also abductor too
 2019-10-17 13:13:51 -07:00
kevinz000 3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239 
properly blacklists space skeletons kek.
 2019-10-17 13:11:05 -07:00
kevinz000 d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance 
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
 2019-10-17 13:09:55 -07:00
kevinz000 1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon 
Removes antimagic from holymelon
 2019-10-17 13:07:40 -07:00
kevinz000 805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236 
Removes the need of "_l" suffixes for digitigrade clothing on mob states
 2019-10-17 13:06:17 -07:00
kevinz000 033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240 
Fixing tracking implant teleport issues.
 2019-10-17 13:05:15 -07:00
kevinz000 d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242 
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
 2019-10-17 13:04:15 -07:00
kevinz000 8be030a931 Merge pull request #9482 from Thalpy/Wiki 
Gives chemistry a library (and updates buttons at the top right of the game too).
 2019-10-17 13:01:37 -07:00
kevinz000 65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238 
Ports some in operator misuse bugfixes.
 2019-10-17 12:59:44 -07:00
kevinz000 eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves 
Halloween Dwarves
 2019-10-17 12:58:28 -07:00
kevinz000 5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish 
foot fetish content for kevin (ankle coverings)
 2019-10-17 12:49:08 -07:00
kevinz000 a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
Trilbyspaceclone 113f62a705 right 
we removed my tools...
 2019-10-17 01:38:29 -04:00
Trilbyspaceclone c0034e93a1 readds chose goose 2019-10-16 22:31:34 -04:00
Trilbyspaceclone c91421984c Merge branch 'master' into Cargo_rebalance 2019-10-16 22:30:12 -04:00
kappa-sama cbf02e76a4 fixes cringe 
why is this broken and who added this
 2019-10-16 19:47:14 -04:00
Ghommie 57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
JTGSZ f1b2eb93d7 Moonshiner doesn't exist here 2019-10-16 13:19:39 -04:00
kevinz000 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07:00
kevinz000 e187f806a0 Merge pull request #9479 from lolman360/ltsurge 
fixes bug with new surgerytools examine
 2019-10-15 23:04:15 -07:00
kevinz000 6d1035e995 Merge pull request #9491 from Poojawa/wingfix 
Fixes missing decorative wing states
 2019-10-15 22:59:45 -07:00
kevinz000 ae19dd16d8 Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms 
Borgs are now consumable by scrub pups.
 2019-10-15 22:59:20 -07:00
kevinz000 3d5facdea5 Merge pull request #9502 from Putnam3145/pandemic-qol2 
Makes beaker spawn on pandemic instead of on user when hands full
 2019-10-15 22:53:44 -07:00
Poojawa 2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Ghommie e8b777f162 typo fixes 2019-10-16 05:10:44 +02:00
Fermi f587beeef4 2 hats and undoes halloween accidental change 2019-10-15 22:56:42 +01:00
Fermi 00adead300 Fixes syringes too. 2019-10-15 21:43:04 +01:00
Ghommie 80ba44e5a2 Smells like work in progress 2019-10-15 22:03:38 +02:00
Ghommie 32013f2aeb More whacky situations. 2019-10-15 21:59:27 +02:00
Ghommie 839f324c99 I need a code quality test. 2019-10-15 21:39:13 +02:00
Ghommie 7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Ghommie fb94e4fef1 properly blacklists space skeletons kek. 2019-10-15 20:45:49 +02:00
Poojawa d9af826333 whatever 2019-10-15 13:19:56 -05:00
Poojawa 1780f1addd animal nom still don't work but runtimes are fixed 
whatever
 2019-10-15 12:11:46 -05:00
Poojawa 04b414f6b4 Improving Sounds yet again 2019-10-15 08:58:22 -05:00
Thalpy 597160ca15 Fixed werid stuff. 2019-10-15 14:17:36 +01:00
Thalpy e115c456f3 Ohh I'm fixing 2019-10-15 13:41:49 +01:00