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

261 Commits

Author SHA1 Message Date
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
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Hatterhat
379a01c3fe packin some more doo dee doo 2019-12-08 01:42:56 -06:00
Hatterhat
6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Artur
19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145
aaf9f12e11 Merge pull request #9981 from Ghommie/Ghommie-cit407 
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
 2019-11-30 22:44:06 -08:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL 
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
 2019-11-30 22:22:52 -08:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
c8d3856d73 Sanity 2019-11-28 20:34:41 +01:00
Ghommie
f2d6e6b78f Allows people to squeeze it into another container. 2019-11-28 20:31:30 +01:00
Ghommie
9bef7edd0f Rags are no longer transparent reagent containers. 2019-11-28 19:59:34 +01:00
kevinz000
ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi 
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
 2019-11-26 16:02:42 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Winter Flare
fb4a47d310 Added more items to vendors. 
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
 2019-11-23 15:58:04 -05:00
Fermi
cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
Thalpy
ebe3859cc5 syncs size 2019-11-20 13:28:35 +00:00
Ghommie
c21a137a62 Fixes super-lube waterflower. 2019-11-19 22:56:29 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Thalpy
bf89df7e7b Fixing things 2019-11-19 16:03:33 +00:00
Thalpy
c0287cf7b5 Reagent sleepers! 2019-11-19 14:50:22 +00:00
Fermi
9fb6c2f3a3 Okay I gotta hop 2019-11-19 12:22:53 +00:00
Ghommie
29114de3f1 The actual waterflower, am I funny yet? 2019-11-12 00:47:36 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie
bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -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
Fermi
00adead300 Fixes syringes too. 2019-10-15 21:43:04 +01:00
Thalpy
e115c456f3 Ohh I'm fixing 2019-10-15 13:41:49 +01:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy
23743c8630 Updates chemmaster 2019-10-15 11:21:05 +01:00
Poojawa
bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
Winter Flare
2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Poojawa
9f88a72142 Makes Medsprays align with patches 
Also ensures you can't spray it on ghosts, ai eyes, etc.
 2019-10-04 16:06:07 -05:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
TrilbySpaceClone
5ecf68918b tada 2019-09-18 03:47:52 -04:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review 
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
 2019-09-10 18:52:49 -04:00
Trilbyspaceclone
275457001d It didnt save my last change 2019-09-08 21:52:28 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Poojawa
cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00