shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,071 Commits 5 Branches 0 Tags
b775565a0ac7a5062cfadffad851334a25390946
Commit Graph

13604 Commits

Author SHA1 Message Date
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
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
Putnam
023d1d6d97 Tweaked weights a bunch 2020-03-06 21:40:44 -08:00
Putnam
f670d09a88 Made IAA work again (whoops) 2020-03-06 21:39:38 -08: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
kappa-sama
1ca4eda4be it begins 2020-03-06 22:58:12 -05:00
monster860
c8535275ce In case it wasn't shitcode enough, makes it reset on move 2020-03-06 22:05:56 -05:00
Putnam
39527ae4a7 prevented hijack/martyr from being contractors 2020-03-06 17:21:41 -08:00
Putnam
1c37b95c0b renamed "gimmick" to "freeform" 2020-03-06 17:21:30 -08:00
Putnam
71ac07426a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-03-06 17:03:24 -08:00
Putnam
182e98192c no longer uses that var 2020-03-06 17:01:43 -08: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
Putnam
436e781ec9 Removed assassin-only, made subterfuge more likely to assassinate 2020-03-06 15:37:59 -08:00
Ghommie
e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
keronshb
f4e3d75088 Blob Reroll 
Part of blob reroll
 2020-03-06 17:37:07 -05:00
Trilbyspaceclone
3e5809ae30 Update code/modules/food_and_drinks/food/snacks_frozen.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-06 16:32:11 -05:00
keronshb
228012c718 Blob refactor (#43872) 
Ports over Blob Refactor from TG
 2020-03-06 15:58:17 -05:00