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

20420 Commits

Author SHA1 Message Date
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
Lin ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1 
Me 2048
 2020-03-08 01:26:39 -06:00
Ghom 57db0e0320 Merge pull request #11383 from Putnam3145/fix-storyteller-weights 
Gives storyteller weights defaults properly (whoops)
 2020-03-08 07:18:09 +01:00
Putnam dfa7637f1b fixes storyteller weights 2020-03-07 22:09:20 -08: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 3e9b998866 Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23 
Stunbaton disarm mode also works on disarm intent now
 2020-03-08 01:39:53 +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 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
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 213086ae9f Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12 
VV now internally always uses \ref instead of REF()
 2020-03-07 11:37:17 +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
Ghom 137e3560c5 Me 2048 2020-03-07 00:57:25 +01:00
Trilbyspaceclone c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -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
Ghom bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +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
kevinz000 c2822dd885 Update stunbaton.dm 2020-03-06 07:23:29 -07:00
kevinz000 0afaf6794c Update stunbaton.dm 2020-03-06 07:21:52 -07:00
Ghom 75aa5ebc95 Merge pull request #11334 from Putnam3145/power-sink-suck 
Made power sink objective more feasible
 2020-03-06 15:09:43 +01:00
TrilbySpaceClone f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05: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 87773343c1 marks area/ruin/space as outdoors so it's not a valid dropoff location 2020-03-06 12:08:32 +01: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
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 c752661399 Update datumvars.dm 2020-03-06 01:51:20 -07:00
kevinz000 6db3a23828 Update belly_obj.dm 2020-03-06 01:44:45 -07:00