shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,451 Commits 5 Branches 0 Tags
4e2c72f2ed4e2c297fbe139879a103148892bced
Commit Graph

3389 Commits

Author SHA1 Message Date
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145
af31fe12c7 Merge pull request #9976 from Ghommie/Ghommie-cit405 
Ports "Fixes transit tube barricade spam"
 2019-12-01 23:07:53 -08:00
Putnam3145
c5c52caf2e Merge pull request #10010 from Ghommie/Ghommie-cit415 
Fixes implant pads and updates them a little (WHY THE HELL DO WE STILL HAVE THIS OLDCODE CRAP LINGERING AROUND?)
 2019-12-01 13:43:21 -08:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes 
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
 2019-11-30 22:51:42 -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
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Ghommie
d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
kevinz000
bd43a08347 Merge pull request #9967 from Ghommie/Ghommie-cit401 
Ports "Plasmamen get plasma in their box"
 2019-11-28 23:11:05 -07:00
Lin
46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393 
Morgues no longer go "ammunition depleted"
 2019-11-28 19:12:25 +00:00
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her 
Ports AI console focus loss fix and fixes an error in my trimline code
 2019-11-28 05:37:36 -08:00
Ghommie
60b8688674 Ports "Fixes transit tube barricade spam" 2019-11-28 07:10:00 +01:00
Ghommie
efcf79aab0 teachin' 🅱️ how to swim 2019-11-28 02:32:43 +01:00
Ghommie
13b9158a44 Ports "Plasmamen get plasma in their box" 2019-11-28 02:30:03 +01:00
kevinz000
2aa0211121 Merge pull request #9906 from Xantholne/xantholne-berets02 
[Ready] Ports/Adds new berets but I don't break the branch somehow
 2019-11-26 19:26:18 -07:00
Fermi
e6ecabe54c Scanner 2019-11-26 23:23:29 +00:00
Fermi
ca2467ff93 Thingie 2019-11-26 23:14:14 +00: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
Ghommie
d6d830b2ec Morgues no longer go "ammunition depleted" 2019-11-26 22:20:52 +01:00
Fermi
c5e6cb8ac0 space 2019-11-26 04:08:10 +00:00
Fermi
69e0f6836a Adds a lil message so people don't spend 25 minutes trying everything 2019-11-26 04:05:43 +00:00
Unknown
4e20f576e6 Merge branch 'master' into xantholne-berets02 2019-11-25 20:16:15 -07:00
Dap
281ddf73ba Ports AI console focus loss fix and fixes an error in my trimline code 
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
 2019-11-25 14:48:26 -07:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajor
6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
 2019-11-25 11:30:43 +13:00
kevinz000
75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 
What do you mean I cant hold the armory on my back? -BOH nerf
 2019-11-23 11:42:37 -07:00
Lin
028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 
Unmodularize closets.
 2019-11-23 05:39:33 +00:00
Putnam3145
037b278e9e Merge pull request #9918 from Ghommie/Ghommie-cit384 
[S] Makes it compile.
 2019-11-22 18:14:41 -08:00
Ghommie
77800cf720 Oh yea it's a list 2019-11-23 03:02:29 +01:00
Ghommie
2d1edf661b Fixes travis. 2019-11-23 02:58:03 +01:00
Putnam3145
ea4fdf727b Merge pull request #9917 from Ghommie/Ghommie-cit384 
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
 2019-11-22 17:06:50 -08:00
Ghommie
82d97ff4a7 This way is better 2019-11-23 01:51:31 +01:00
Ghommie
24c93d9df6 [S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad. 2019-11-23 01:46:59 +01:00
GrayRachnid
77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 18:50:24 -05:00
Putnam3145
6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384 
chem dispenser beakers and bikehorn fixes.
 2019-11-22 15:48:28 -08:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Winter Flare
03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245 
Touching up job outfits equip procs, little PDA fix.
 2019-11-22 02:37:49 +00:00
Lin
3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243 
Ports "You can now click on objects and mobs below flaps and signs"
 2019-11-22 01:36:47 +00:00
Lin
c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix 
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
 2019-11-22 01:16:35 +00:00
Lin
2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox 
Fixes gold toolbox inhand sprite having the wrong name
 2019-11-22 01:14:39 +00:00
Thalpy
7b17bf2acd god damn bitflags ARGH 2019-11-21 20:30:49 +00:00
Thalpy
7460c28b60 Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL 2019-11-21 19:39:58 +00:00
Thalpy
0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Thalpy
a0a52018f3 Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:06:34 +00:00
Thalpy
da1da717d2 Update code/game/objects/items/devices/scanners.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:03:48 +00:00
Thalpy
bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Unknown
4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Thalpy
00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Useroth
2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00