shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,157 Commits 5 Branches 0 Tags
d71f37167f896b57e77dcac15f4462e3efdf1be3
Commit Graph

2742 Commits

Author SHA1 Message Date
Poojawa d71f37167f I'm about to go fucking APE 
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
 2019-08-16 04:58:16 -05:00
Poojawa 264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa 2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
deathride58 5f6a110f73 Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71 
Hmm, today the Hierophant will go sicko mode on shaft miners.
 2019-08-14 15:43:51 -04:00
kevinz000 a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
kevinz000 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
kevinz000 b75c82b4ee Merge pull request #9054 from Sishen1542/stando 
stands now remove trait_nodeath from their user if given by memento mori
 2019-08-11 10:11:11 -07:00
kevinz000 a576e71a01 Merge pull request #9101 from Sishen1542/stealthy-surgery 
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
 2019-08-11 09:59:29 -07:00
Sishen 23d4b9827d fix, yadda yadda 2019-08-11 01:19:37 -04:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
BlackMajor 5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
Sishen 51011ccf97 Update guardian.dm 2019-08-10 07:05:53 -04:00
Sishen 15dbb7ff32 Update guardian.dm 2019-08-10 07:03:45 -04:00
kevinz000 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181 
Two lines fixes for invisible zipties and borked legcuffs.
 2019-08-09 22:17:31 -07:00
Ghommie ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
Sishen 1fc69a13a4 okay fixed 2019-08-08 22:02:12 -04:00
Ghommie 12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Poojawa 98a279a6db likely fixes the examine bug lol 2019-08-08 17:45:01 -05:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Sishen 582b355224 Update guardian.dm 2019-08-08 11:00:23 -04:00
Ghommie 00bca0dd39 raise priority. 2019-08-07 19:20:14 +02:00
Fermi ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Fermi f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy 53e9c140cf Merge pull request #22 from Citadel-Station-13/master 
YARR
 2019-08-06 16:08:16 +01:00
BlackMajor 030b5f6bca Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66 
[SPEEDMERGE] I BROKE SUBTLER
 2019-08-06 21:45:45 +12:00
Sishen 9f5b54940c adds in a memento mori check 2019-08-05 21:31:17 -04:00
Sishen e3c3742aec Update guardian.dm 2019-08-05 06:27:10 -04:00
kevinz000 48db0b129e Update hierophant.dm 2019-08-05 01:55:05 -07:00
kevinz000 58f8920008 Update hierophant.dm 2019-08-05 01:51:51 -07:00
kevinz000 fb4709f6db Update hierophant.dm 2019-08-05 01:49:28 -07:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000 f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
kevinz000 489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166 
Adds in worn overlays for different types of cuffs.
 2019-08-04 19:19:19 -07:00
kevinz000 5cfb7ef49d Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20 
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
 2019-08-04 19:18:53 -07:00
kevinz000 8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170 
undergarment fixes.
 2019-08-04 19:13:21 -07:00
kevinz000 f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix 
Fixes a runtime with a simple mob verb
 2019-08-04 19:12:57 -07:00
kevinz000 53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes 
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
 2019-08-04 19:09:36 -07:00
kevinz000 4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock 
Adds the ability to construct and deconstruct locker locks
 2019-08-04 19:07:35 -07:00
kevinz000 27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Poojawa 7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe 
we're all gucchi now boys
 2019-08-04 04:07:44 -05:00
Chayse Ramsay d3620c5894 Merge branch 'Helmet-Internals' of https://github.com/jakeramsay007/Citadel-Station-13 into Helmet-Internals 2019-08-04 05:49:10 +01:00
Chayse Ramsay f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay 5e757f1012 Update code/modules/mob/living/carbon/life.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-08-04 05:26:16 +01:00
Chayse Ramsay 0a7054c604 Update code/modules/mob/living/carbon/inventory.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-08-04 05:26:02 +01:00
Chayse Ramsay 46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Sishen 1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
kevinz000 eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164 
Makes staminaloss also apply the oxyloss fullscreen overlay.
 2019-08-02 01:43:46 -07:00
Linzolle bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Poojawa b5fcaf20e6 Fixes a runtime with a simple mob verb 2019-08-01 17:40:43 -05:00