shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,668 Commits 5 Branches 0 Tags
8db3a3ced4e4bbda69229c7e5ed4d1dc0cd8ca88
Commit Graph

13430 Commits

Author SHA1 Message Date
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
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
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
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
Ghom
f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293 
Makes two new legion drops
 2020-03-07 11:39:51 +01:00
Ghom
5fecf00621 Merge pull request #11361 from Ragolution/just-slide-on-in 
Fixes bartender drink slide spill A
 2020-03-07 11:37:41 +01:00
Ghom
aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7 
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
 2020-03-07 11:36:37 +01:00
Ghom
fdf3dc82e4 Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17 
Makes xenobiology powergamers slightly less horrible for the server by caching slime mutation lists
 2020-03-07 11:36:06 +01:00
Ghom
865e859141 Merge pull request #11359 from Trilbyspaceclone/lightswitch 
Corrects snowcones
 2020-03-07 11:35:39 +01:00
kevinz000
5a18cac701 Merge pull request #11338 from Crystal9156/patch-1 
Fixes Chocolate Jelly Donuts
 2020-03-07 03:26:57 -07:00
kevinz000
02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 
Porting movespeed modifiers code updates.
 2020-03-07 03:26:48 -07:00
kevinz000
204311abad Update code/modules/mob/living/living.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 01:06:24 -07:00
Ragolution
9d1cef2e97 Update code/modules/reagents/reagent_containers.dm 
Drink slide changes recommended by Ghom p.2

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 01:58:17 -05:00
Ragolution
860d6b0827 Update code/modules/reagents/reagent_containers.dm 
Drink slide changes recommended by Ghom p.1

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 01:58:06 -05:00
Detective Google
bb4b6f8c01 src.mind.assigned_role == "AI" 2020-03-07 00:06:17 -06:00
Detective Google
c7eb8b430d adds the option for AIs to cryo without being dragged and stuffed in a pod on the other side of the station. 2020-03-06 23:22:41 -06:00
monster860
c8535275ce In case it wasn't shitcode enough, makes it reset on move 2020-03-06 22:05:56 -05:00
Ghommie
7bed0d5c87 Of runtimes and null. 2020-03-07 01:57:15 +01:00
keronshb
930643b01a Blob Reroll 
Also ports blob reroll
 2020-03-06 19:06:50 -05:00
Ghom
137e3560c5 Me 2048 2020-03-07 00:57:25 +01:00
Ghom
9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. 2020-03-07 00:42:18 +01:00
Ghommie
e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00