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

13575 Commits

Author SHA1 Message Date
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
Ghom
bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +01:00
Ghommie
079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. 2020-03-06 19:05:45 +01:00
kevinz000
a669e87db1 Merge branch 'master' into gc_debugging 2020-03-06 10:14:19 -07:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
Ragolution
1cc7d01a44 Culls irrelevant targeting information. 2020-03-06 11:39:27 -05:00
Ragolution
4857bd120c Fixes bartender drink slide spill 
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
 2020-03-06 10:06:59 -05:00
Ghom
c6c676ceb5 Merge pull request #11298 from Kraseo/contracties 
Ports TG's Syndicate Contractors
 2020-03-06 15:23:30 +01:00
TrilbySpaceClone
f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
Ghommie
a298a34ae9 Oh yea. 2020-03-06 14:57:34 +01:00
Ghommie
5d6eb6f24b Patches some awful integrated circuit examiner runtime errors. 2020-03-06 14:56:49 +01:00
Ragolution
597e1210f3 fix quintuple sec mix_sound def 
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
 2020-03-06 08:38:33 -05:00
kevinz000
5aacdded63 Update gloves.dm 2020-03-06 06:23:56 -07:00
kevinz000
2f83492451 Update ninjaDrainAct.dm 2020-03-06 06:23:13 -07:00
Ghom
4b3725bb43 Merge pull request #11348 from Citadel-Station-13/kevinz000-patch-19 
fixes pool mist garbage collection
 2020-03-06 14:20:58 +01:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
kevinz000
0ace3f2310 Update buffing.dm 2020-03-06 05:42:28 -07:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
monster860
4a108d7a9a fixes oopsie 2020-03-06 04:40:22 -05:00
monster860
86baaf3710 Pixel shifting for ERP 2020-03-06 04:31:46 -05:00
kevinz000
3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000
62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000
87c869a735 Update carbon.dm 2020-03-06 02:00:19 -07:00
kevinz000
6db3a23828 Update belly_obj.dm 2020-03-06 01:44:45 -07:00
kevinz000
4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00