shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,455 Commits 5 Branches 0 Tags
bbf43b0464d870fa3b723f12973caaf885e37f4e
Commit Graph
31455 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kraseo bbf43b0464 whoopsies almost forgot this 2020-03-07 20:48:04 +01:00
Kraseo a5ef41c0fc adjust numbers, fix shuttle dropoffs 2020-03-07 20:31:49 +01:00
CitadelStationBot c9cad7a0ff Automatic changelog generation for PR #11193 [ci skip] 2020-03-07 04:39:53 -06:00
GhomandGitHub f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293 
Makes two new legion drops
 2020-03-07 11:39:51 +01:00
CitadelStationBot 02a32dc2bd Automatic changelog generation for PR #11339 [ci skip] 2020-03-07 04:39:02 -06:00
GhomandGitHub 6422b15430 Merge pull request #11339 from MrJWhit/teg-fix-so-fract-doesn't-yell 
TEG fix so fract doesn't yell at me
 2020-03-07 11:38:59 +01:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
CitadelStationBot dce540b4cf Automatic changelog generation for PR #11359 [ci skip] 2020-03-07 04:35:41 -06:00
GhomandGitHub 865e859141 Merge pull request #11359 from Trilbyspaceclone/lightswitch 
Corrects snowcones
 2020-03-07 11:35:39 +01:00
CitadelStationBot 1b926905fb Automatic changelog generation for PR #11338 [ci skip] 2020-03-07 04:27:00 -06:00
kevinz000andGitHub 5a18cac701 Merge pull request #11338 from Crystal9156/patch-1 
Fixes Chocolate Jelly Donuts
 2020-03-07 03:26:57 -07:00
CitadelStationBot cab5747acf Automatic changelog generation for PR #11340 [ci skip] 2020-03-07 04:26:51 -06:00
kevinz000andGitHub 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 
Porting movespeed modifiers code updates.
 2020-03-07 03:26:48 -07:00
CitadelStationBot f58955b80a Automatic changelog generation for PR #11358 [ci skip] 2020-03-07 04:24:32 -06:00
kevinz000andGitHub 7de59975fc Merge pull request #11358 from bunny232/master 
Box bar lightswitch/pipe fixes now with mapmerge
 2020-03-07 03:24:29 -07:00
RagolutionGitHubGhom
 		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
RagolutionGitHubGhom
 		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
CitadelStationBot 4dfa3ec3cf Automatic changelog generation for PR #11367 [ci skip] 2020-03-06 17:15:16 -06:00
GhomandGitHub 0e8d1041a4 Merge pull request #11367 from Trilbyspaceclone/patch-303 
Corrects arrow crafting
 2020-03-07 00:15:13 +01:00
TrilbyspacecloneandGitHub c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
TrilbyspacecloneGitHubGhom
 		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
GhomandGitHub bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +01:00
CitadelStationBot 928c389b17 Automatic changelog generation for PR #11336 [ci skip] 2020-03-06 14:47:17 -06:00
GhomandGitHub 65b7833738 Merge pull request #11336 from Putnam3145/mkultra-aaa 
Makes MKUltra's explosion no longer spread prefbreak gas
 2020-03-06 21:47:14 +01: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
bunny232 8f563797df Update BoxStation.dmm 2020-03-06 09:28:37 -05:00
CitadelStationBot 65b9fd8f70 Automatic changelog generation for PR #11298 [ci skip] 2020-03-06 08:23:33 -06:00
GhomandGitHub c6c676ceb5 Merge pull request #11298 from Kraseo/contracties 
Ports TG's Syndicate Contractors
 2020-03-06 15:23:30 +01:00
CitadelStationBot b1cc622097 Automatic changelog generation for PR #11334 [ci skip] 2020-03-06 08:09:46 -06:00
GhomandGitHub 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 2f492881ce rouge pixle 2020-03-06 09:09:28 -05:00
TrilbySpaceClone f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
bunny232 e13fef13fd a 2020-03-06 09:00:59 -05:00
GhomandGitHub 7eb4607a47 Merge pull request #11355 from Ragolution/honk-in-your-hands 
fix quintuple sec mix_sound def
 2020-03-06 14:53:11 +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
GhomandGitHub 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
CitadelStationBot a7673a7c1e Automatic changelog generation for PR #11222 [ci skip] 2020-03-06 06:48:06 -06:00
GhomandGitHub 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
TrilbyspacecloneandGitHub 5b808c511f better seeds 2020-03-06 07:09:16 -05:00
Kraseo 2b4056765d i am not asking anymore 2020-03-06 12:25:38 +01:00
bunny232 8da5ca9319 Update BoxStation.dmm 2020-03-06 06:16:27 -05: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
kevinz000andGitHub 3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000andGitHub 62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000andGitHub c752661399 Update datumvars.dm 2020-03-06 01:51:20 -07:00
kevinz000andGitHub 4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00