cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 07:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'evilew:master' into master

Browse Source
This commit is contained in:
Alphas00
2024-09-05 17:59:09 +02:00
committed by GitHub
parent 7da65d8589 f5abc69b16
commit 679953b2af
18 changed files with 3260 additions and 2181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/corpse.dm
+1 -2
View File
@@ -744,8 +744,7 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
r_hand = /obj/item/storage/box/syndie_kit/soporific_bundle
l_hand = /obj/item/gun/ballistic/automatic/pistol
l_hand = /obj/item/gun/energy/kinetic_accelerator/crossbow/feeder
l_pocket = /obj/item/crowbar
r_pocket = /obj/item/gun/energy/fatoray
id = /obj/item/card/id/syndicate/anyone
code/modules/awaymissions/mission_code/snowdin.dm
+33 -7
View File
@@ -128,14 +128,41 @@
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = TRUE
/area/awaymission/snowdin/comms
name = "Radio Tower"
icon_state = "awaycontent16"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = TRUE
/area/awaymission/snowdin/cabin
name = "Strange cabin"
icon_state = "awaycontent18"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
/area/awaymission/snowdin/cargo
name = "Exploration Base"
icon_state = "awaycontent16"
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = TRUE
/area/awaymission/snowdin/transit
name = "Transit Shuttle Docks"
icon_state = "awaycontent16"
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = FALSE
/area/shuttle/snowdin/elevator1
name = "Excavation Elevator"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/shuttle/snowdin/elevator2
name = "Mining Elevator"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/shuttle/snowdin/transit
name = "Snowdin Outpost - Transit Shuttle"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
//shuttle console for elevators//
@@ -155,7 +182,7 @@
icon_keyboard = "tech_key"
light_color = LIGHT_COLOR_CYAN
shuttleId = "snowdintransit"
possible_destinations = "snowdintransit_a;snowdintransit_b"
possible_destinations = "snowdintransit_a;snowdintransit_b;snowdintransit_c"
//liquid plasma!!!!!!//
@@ -514,10 +541,8 @@
name = "dungeon heavy"
loot = list(/obj/item/twohanded/singularityhammer = 1,
/obj/item/twohanded/dualsaber/hypereutactic = 1,
/obj/item/organ/brain/alien = 1,
/obj/item/gun/ballistic/automatic/c20r/unrestricted = 1,
/obj/item/book/granter/spell/charge = 1,
/obj/item/book/granter/martial/cqc = 1,
/obj/item/book/granter/spell/fattening/steal = 1,
/obj/item/dnainjector/lasereyesmut = 1,
/obj/item/book/granter/spell/fattening/transfer = 1)
@@ -527,11 +552,12 @@
lootdoubles = 2
lootcount = 1
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
/obj/item/toy/snowball = 15,
/obj/item/shovel = 10,
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 1,
/obj/item/toy/snowball = 5,
/obj/item/shovel = 4,
/obj/item/twohanded/spear = 8,
)
/obj/item/stack/ore/iron{amount = 50} = 10,
/obj/item/stack/ore/glass{amount = 50} = 10)
//special items//--
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -1893,7 +1893,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Hyperstation 13: Mood now influences action speed.
if(H.fatness) // GS13
if(H.fatness && !HAS_TRAIT(H, TRAIT_NO_FAT_SLOWDOWN)) // GS13
var/fatness_delay = (H.fatness / FATNESS_DIVISOR)
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
fatness_delay = fatness_delay - flight