shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,761 Commits 5 Branches 0 Tags
8f44cf13054a30638fb8edf8564d7643e4afc749
Commit Graph

14466 Commits

Author SHA1 Message Date
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb 7e1e905a95 Line ending changes, I hope 
here goes nothing.
 2020-03-08 20:36:05 -04:00
Ghom f1d6360b70 Shuttle timer display seconds fix 2020-03-09 01:31:39 +01:00
keronshb 0d3da4fcc0 maybe? last go? 2 
Should be the final part I hope
 2020-03-08 20:11:13 -04:00
keronshb 94958581b9 maybe? last go? 
maybe? last go?
 2020-03-08 20:10:34 -04:00
keronshb fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Pne more test go
 2020-03-08 19:48:30 -04:00
Ghom 1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00
Ghom 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
keronshb 7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Trying to fix this shit again
 2020-03-08 19:17:28 -04:00
Ghom 1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00
keronshb d460f5359e Hopefully this will fix it? 
Hopefully this will fix it?
 2020-03-08 18:49:18 -04:00
keronshb 9b63c7aa11 Trying to see if this will fix the line end issue 
Trying to see if this will fix the line end issue
 2020-03-08 18:48:42 -04:00
Ghom 187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
ZeroMan 388891bde3 fianlly ive discovered obanium 2020-03-08 18:31:12 -04:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb 0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
To fixs something?
 2020-03-08 17:51:17 -04:00
Putnam eacdc3b438 Let gorlex marauders contract, and made them hijack 2x as fast as other traitors 2020-03-08 14:05:04 -07:00
ZeroMan 1941169582 will this fucking work 2020-03-08 15:45:35 -04:00
Winter Flare bb9066e9cb Food Additions / Butter Bear 
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
 2020-03-08 14:36:08 -04:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000 274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592 
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
 2020-03-08 11:10:30 -07:00
kevinz000 b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610 
Of runtimes and null.
 2020-03-08 11:10:02 -07:00
kevinz000 5add119388 Merge pull request #11374 from Detective-Google/AI-cryo 
Adds a verb for AIs to cryo
 2020-03-08 11:09:48 -07:00
kevinz000 2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607 
Makes monkey probability of gorillize from radiation exponential.
 2020-03-08 08:15:11 -07:00
kevinz000 36f1e952b4 Merge pull request #11357 from Ghommie/Ghommie-cit606 
Patches some awful integrated circuit examiner runtime errors.
 2020-03-08 08:14:58 -07:00
Ghom 3c066aa771 Update pai_shell.dm 2020-03-08 15:46:38 +01:00
kevinz000 c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 
Porting the musician and curator beacons.
 2020-03-08 07:34:48 -07:00
Ghom 7ad2c6dce0 Update pai.dm 2020-03-08 14:55:15 +01:00
Ghom 8f6677326d Update pai.dm 2020-03-08 14:51:41 +01:00
Ghom a0e5f1651e Update pai_shell.dm 2020-03-08 14:49:43 +01:00
Ghom 4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
Lin ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1 
Me 2048
 2020-03-08 01:26:39 -06:00
kevinz000 926fd79634 k 2020-03-07 20:24:51 -08:00
ZeroMan a431bdb0de okay here we go 2020-03-07 23:20:01 -05:00
Ghommie 10c8dbbb6e hOLd oN 2020-03-08 02:47:38 +01:00
Ghommie e23e478c06 mOre rUntIMeS 2020-03-08 02:43:35 +01:00
Ghommie 5bcb38c79f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610 2020-03-08 02:33:27 +01:00
Ghom 525ac3a8fc Merge pull request #11344 from Citadel-Station-13/kevinz000-patch-11 
vore bellies now clear owner.vore_selected on delete
 2020-03-08 01:41:05 +01:00
Ghom b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15 
/carbons now null out hand_bodyparts on Destroy()
 2020-03-08 01:40:43 +01:00
Ghom 1e0ea6facf Merge pull request #11353 from Citadel-Station-13/kevinz000-patch-22 
Rebalances nanite adrenals
 2020-03-08 01:40:07 +01:00
Ghom 64215b41a4 Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground 
Culls irrelevant targeting information on Drink Fling.
 2020-03-08 01:39:41 +01:00
Ghom 5f3496e908 Update human.dm 2020-03-08 01:27:35 +01:00
Ghom 40fd1deeeb Merge pull request #11364 from kevinz000/gc_debugging 
Fixes more xenobio GC memes
 2020-03-08 01:16:41 +01:00
Ghommie 97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
Lin 1a36d6e6fa Merge pull request #10770 from Ghommie/Ghommie-cit536 
Removes an unused file and another outdated one.
 2020-03-07 17:59:12 -06:00
Lin 3dfd7a5ea4 Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19 
Nerfs ninja stungloves to match new batons
 2020-03-07 17:50:54 -06:00
kevinz000 7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
Kraseo dff0e03f11 fixes null runtime and baton inhands 2020-03-08 00:27:16 +01:00
Kraseo a5ef41c0fc adjust numbers, fix shuttle dropoffs 2020-03-07 20:31:49 +01:00
Trilbyspaceclone 748614b98a Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 08:26:15 -05:00