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

Merge branch 'KabKebab:master' into minor_reworks

Browse Source
This commit is contained in:
GDLW
2023-02-07 16:08:38 +01:00
committed by GitHub
parent 9d93a55549 27cbade63c
commit 169ae14577
20 changed files with 104 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/launch.json
Vendored
+10 -1
View File
@@ -1,12 +1,21 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "dm: build - ${command:CurrentDME}",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
}
},
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon",
"preLaunchTask": "dm: build - ${command:CurrentDME}",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
},
]
}
GainStation13/code/mobs/unusualtentical.dm
-1
View File
@@ -1,4 +1,3 @@
/obj/code/game/mobs/unusualtentical
name = "unusualtentical"
desc = "Whats this doing here?"
GainStation13/code/modules/mob/living/emote.dm
+47 -50
View File
@@ -1,60 +1,58 @@
/datum/emote/living/gurgle
key = "gurgle"
key_third_person = "gurgles"
message = "'s belly gurgles"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/gurgle/run_emote(mob/living/user, params)
if(ishuman(user))
if(prob(50))
playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1)
else
playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1)
if(!ishuman(user))
return FALSE
if(prob(50))
playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1)
else
playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1)
. = ..()
/datum/emote/living/burp/run_emote(mob/living/user, params)
if(ishuman(user))
playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1)
if(!ishuman(user))
return FALSE
playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1)
. = ..()
/datum/emote/living/fart
key = "fart"
key_third_person = "farts"
message = " farts"
message = "farts"
emote_type = EMOTE_AUDIBLE
//god hates me for this -Metha
/datum/emote/living/fart/run_emote(mob/living/user, params)
if(ishuman(user))
var/fartSoundChoice = rand(3)
switch(fartSoundChoice)
if (0) playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1)
if (1) playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1)
if (2) playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1)
if (3) playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1)
. = ..()
if(!ishuman(user))
return FALSE
var/fartSoundChoice = rand(3)
switch(fartSoundChoice)
if (0)
playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1)
if (1)
playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1)
if (2)
playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1)
if (3)
playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1)
. = ..()
//Shhh... It's a secret! Don't tell or I'll steal your legs
/datum/emote/living/burunyu
key = "burunyu"
key_third_person = "burunyues"
message = " emits a strange feline sound"
message = "emits a strange feline sound"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/burunyu/run_emote(mob/living/user, params)
@@ -65,29 +63,28 @@
/datum/emote/living/belch
key = "belch"
key_third_person = "belches loudly"
message = " belches"
message = "belches"
emote_type = EMOTE_AUDIBLE
//god hates me for this -Metha
/datum/emote/living/belch/run_emote(mob/living/user, params)
if(ishuman(user))
if(!ishuman(user))
return FALSE
var/fartSoundChoice = rand(5)
switch(fartSoundChoice)
if(0)
playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1)
if(1)
playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1)
if(2)
playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1)
if(3)
playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1)
if(4)
playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1)
if(5)
playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1)
var/fartSoundChoice = rand(5)
switch(fartSoundChoice)
if (0) playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1)
if (1) playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1)
if (2) playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1)
if (3) playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1)
if (4) playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1)
if (5) playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1)
. = ..()
. = ..()
GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
+2 -1
View File
@@ -12,4 +12,5 @@
/datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M)
if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
M.fatness = M.fatness + 10
return ..()
return ..()
GainStation13/code/modules/vending/gatocola.dm
+1 -5
View File
@@ -23,10 +23,6 @@
refill_canister = /obj/item/vending_refill/mealdor
obj/item/vending_refill/mealdor
/obj/item/vending_refill/mealdor
machine_name = "Meal Vendor Refill"
icon_state = "refill_mealdor"
#define STANDARD_CHARGE 1
#define CONTRABAND_CHARGE 2
#define COIN_CHARGE 3
GainStation13/code/modules/vending/mealdor.dm
+1 -9
View File
@@ -39,7 +39,7 @@
/obj/item/reagent_containers/food/snacks/cookie = 10,
/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
/obj/item/reagent_containers/food/snacks/salad = 20,
/obj/item/reagent_containers/food/snacks/salad/hellcobb =10,
/obj/item/reagent_containers/food/snacks/salad/hellcobb = 10,
/obj/item/clothing/under/cowkini = 5,
)
premium = list(
@@ -48,11 +48,3 @@
)
refill_canister = /obj/item/vending_refill/mealdor
obj/item/vending_refill/mealdor
machine_name = "Meal Vendor Refill"
icon_state = "refill_mealdor"
#define STANDARD_CHARGE 1
#define CONTRABAND_CHARGE 2
#define COIN_CHARGE 3
_maps/RandomRuins/SpaceRuins/fastfood.dmm
+4 -4
View File
@@ -110,7 +110,7 @@
"lL" = (/obj/machinery/light/small{dir = 8},/obj/structure/janitorialcart,/obj/item/mop/advanced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"lM" = (/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"lO" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"lP" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/bar)
"lP" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/bar)
"mb" = (/obj/machinery/vending/coffee,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"mj" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar)
"mx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
@@ -161,7 +161,7 @@
"tK" = (/obj/structure/lattice/catwalk,/turf/open/space/basic,/area/ruin/space/has_grav/hotel/bar)
"tQ" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"tX" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"tZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"tZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uc" = (/obj/machinery/icecream_vat,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"ud" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uj" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/sign/poster/contraband/pwr_game{pixel_x = 32},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar{name = "Restaurant Main Area"})
@@ -171,7 +171,7 @@
"uv" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar)
"uw" = (/turf/closed/wall,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uy" = (/obj/structure/table/wood,/obj/item/storage/backpack/cheeseburgerbackpack,/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"uC" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/bar)
"uS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"vc" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar)
@@ -301,7 +301,7 @@
"KT" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar)
"Lc" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar)
"Ld" = (/obj/structure/window/fulltile,/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/bar)
"Lf" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/bar)
"Lf" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/bar)
"Lg" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/bar)
"Lk" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/obj/item/reagent_containers/food/snacks/cubannachos,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
"Ln" = (/obj/structure/rack/shelf,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"})
_maps/RandomRuins/SpaceRuins/feeders_den.dmm
+9 -8
View File
@@ -58,9 +58,10 @@
"kC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"kK" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"ls" = (/turf/open/floor/plasteel,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"lR" = (/obj/machinery/vending/kink{free = 1},/turf/template_noop,/area/template_noop)
"ma" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mf" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,/obj/item/reagent_containers/food/snacks/burger/superbite,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mm" = (/obj/machinery/vending/mealdor,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mm" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mD" = (/obj/machinery/door/airlock/glass_large,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mJ" = (/obj/structure/scale,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"mU" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = 11},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -76,7 +77,7 @@
"oY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"pc" = (/turf/open/floor/wood{icon_state = "wood-broken6"},/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"pf" = (/obj/item/trash/candy,/turf/open/floor/carpet/black,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"ph" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"ph" = (/obj/machinery/vending/gato{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"qh" = (/obj/machinery/food_cart,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"qi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"qq" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -107,7 +108,7 @@
"tI" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"tP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"tV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/door/airlock/public,/obj/effect/turf_decal{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"tZ" = (/obj/machinery/vending/mealdor,/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"tZ" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"uc" = (/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets/donkpocketberry{pixel_y = 4},/obj/item/storage/box/donkpockets/donkpocketgondola{pixel_y = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"uy" = (/obj/machinery/feeding_tube,/obj/machinery/airalarm/syndicate{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"uA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -166,7 +167,7 @@
"Ex" = (/obj/item/trash/boritos,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Ff" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Fm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/item/storage/toolbox/syndicate,/obj/effect/turf_decal/box/red,/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable,/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"FD" = (/obj/machinery/vending/dinnerware,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"FD" = (/obj/machinery/vending/dinnerware{free = 1},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"FE" = (/turf/template_noop,/area/template_noop)
"FH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"GZ" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/superbite,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -174,14 +175,14 @@
"Hp" = (/obj/structure/closet/crate/secure/loot,/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"HQ" = (/obj/structure/sign/poster/contraband/eat,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Iq" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"It" = (/obj/machinery/vending/cola,/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"It" = (/obj/machinery/vending/cola{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"IC" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav)
"Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Jx" = (/obj/item/trash/can,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"JW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Ko" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Ku" = (/obj/machinery/vending/mealdor,/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Ku" = (/obj/machinery/vending/mealdor{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"KK" = (/obj/vehicle/ridden/wheelchair,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/wood,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"KR" = (/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"KW" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -241,7 +242,7 @@
"YE" = (/obj/structure/rack,/obj/item/storage/toolbox/syndicate,/obj/item/multitool,/obj/item/clothing/head/welding,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"YU" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/burger/cheese,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"YX" = (/obj/structure/rack/shelf,/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/rods/twentyfive,/obj/item/stock_parts/cell/high/plus,/obj/item/stock_parts/cell/high/plus,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Zn" = (/obj/machinery/vending/kink,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Zn" = (/obj/machinery/vending/kink{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"Zw" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
"ZC" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav)
"ZO" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/turf_decal/box/red,/turf/open/floor/plasteel,/area/ruin/space/has_grav/listeningstation{name = "Feeder Den"})
@@ -262,7 +263,7 @@ FEFEFEFEFEFEBrBrBrnrNAsqsqsqHQHiUEaqnrBrBrDcnrDcsIaMrWndNvKRKRTHpcCuItnrnrDcBrBr
FEFEFEebebebqFBrBrnrfMsqelzCnrLMelZwnrBrDcnrgoNzPLExwAvvtfOcrSSpDMoKrtDUbUnrDcBrnrLMelZwnrelZwCHfMnrBrBrFEFEFE
FEFEFEFEFEFEFEBrBrDcnrTKmDSmDcsTmDSmDcnrDctEegvkkKdHPLPLPLPLJxrtKKiWkKkKkKzsnrnrnrdCmDSmnrmDSmwnnrDcBrBrFEFEFE
FEFEFEFEFEFEFEBrBrBrnrtZgntPkKkKJWtPkKKokKkKkKkKkKkKkKqikKkKkKXhkKkKkKkKkKkKkKKokKkKJWtPkKgntPmmnrBrBrFEFEFEFE
FEFEFEFEFEFEfmBrBrBrnrZnNBLvYAYAuAKWYAYAYAYAYAYAYABDTGXWTGTGTGqquOuOkakakaybYAYAYAYAuAKWYAxJLfZnnrqFebebebFEFE
FElRFEFEFEFEfmBrBrBrnrZnNBLvYAYAuAKWYAYAYAYAYAYAYABDTGXWTGTGTGqquOuOkakakaybYAYAYAYAuAKWYAxJLfZnnrqFebebebFEFE
FEFEFEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrnrDxvYNxgUSsgUuXvYvYnrnrnrgqnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFE
FEFEFEFEBrZCfmISBrBrBrnrMaEqnrxGHpxGnrWNYEfncnbanrDxvYFDLNvYsRiNvYsanrrJZOWrkoPgnrridlnunrfNginrBrBrBrFEFEFEFE
FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrikJhJhWsDOlslslslsvtDxvYSyIqvYrjtIvYmUnrcWmaICrscxtVNgbXkCnrfNdAnrBrBrBrFEFEFEFE
code/datums/components/uplink.dm
+1 -1
View File
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(uplinks)
var/compact_mode = FALSE
var/debug = FALSE
/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20, datum/ui_state/_checkstate)
/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 15, datum/ui_state/_checkstate)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
code/datums/weather/weather_types/layenia.dm
+4
View File
@@ -1,3 +1,5 @@
//GS13 EDIT
/*
/datum/weather/ash_storm/layenia //because fuck writing my own code
name = "Layenia Weather"
desc = "A subset of weather affecting Layenia"
@@ -25,6 +27,8 @@
aesthetic = TRUE
*/
//datum/weather/layenia/telegraph()
//datum/weather/layenia/start()
code/game/gamemodes/nuclear/nuclear.dm
+2 -2
View File
@@ -129,7 +129,7 @@
backpack_contents = list(/obj/item/storage/box/syndie=1,\
/obj/item/kitchen/knife/combat/survival)
var/tc = 25
var/tc = 20
var/command_radio = FALSE
var/uplink_type = /obj/item/uplink/nuclear
@@ -192,4 +192,4 @@
/obj/item/gun/ballistic/automatic/pistol=1,\
/obj/item/kitchen/knife/combat/survival)
tc = 40
tc = 25 //Lone ops had too much TC for a station with such low player count
code/game/objects/items/stacks/tiles/tile_mineral.dm
+5 -6
View File
@@ -61,20 +61,19 @@
mineralType = "calorite"
materials = list(MAT_CALORITE=500)
/obj/item/stack/tile/mineral/calorite_hide //GS13 - disguised variant
/obj/item/stack/tile/mineral/calorite/hide //GS13 - disguised variant
name = "Floor tile"
singular_name = "calorite floor tile"
desc = "A tile totally made out of steel."
icon_state = "tile_calorite_hide"
turf_type = /turf/open/floor/mineral/calorite_hide
icon_state = "tile"
turf_type = /turf/open/floor/mineral/calorite/hide
/obj/item/stack/tile/mineral/calorite_strong //GS13 - strong variant
/obj/item/stack/tile/mineral/calorite/strong //GS13 - strong variant
name = "Infused calorite tile"
singular_name = "Infused calorite floor tile"
desc = "A tile made out of stronger variant of calorite. Bwuurp."
icon_state = "tile_calorite_strong"
turf_type = /turf/open/floor/mineral/calorite_strong
turf_type = /turf/open/floor/mineral/calorite/strong
/obj/item/stack/tile/mineral/abductor
code/game/turfs/simulated/floor/mineral_floor.dm
+9 -19
View File
@@ -214,41 +214,31 @@
icons = list("calorite","calorite_dam")
var/last_event = 0
var/active = null
///How much fatness is added to the user upon crossing?
var/fat_to_add = 50
/turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return
if(!istype(M, /mob/living/carbon) || HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return FALSE
else
M.fatness = M.fatness + 50
M.fatness = M.fatness + fat_to_add
// calorite floor, disguised version - GS13
/turf/open/floor/mineral/calorite_hide
/turf/open/floor/mineral/calorite/hide
name = "Steel floor"
icon_state = "calorite_hide"
floor_tile = /obj/item/stack/tile/mineral/calorite_hide
floor_tile = /obj/item/stack/tile/mineral/calorite/hide
icons = list("calorite_hide","calorite_hide_dam")
/turf/open/floor/mineral/calorite_hide/Entered(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return
else
M.fatness = M.fatness + 50
// calorite floor, powerful version - GS13
/turf/open/floor/mineral/calorite_strong
/turf/open/floor/mineral/calorite/strong
name = "Infused calorite floor"
icon_state = "calorite_strong"
floor_tile = /obj/item/stack/tile/mineral/calorite_strong
floor_tile = /obj/item/stack/tile/mineral/calorite/strong
icons = list("calorite_strong","calorite_strong_dam")
/turf/open/floor/mineral/calorite_strong/Entered(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return
else
M.fatness = M.fatness + 50
//DIAMOND
/turf/open/floor/mineral/diamond
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+2 -2
View File
@@ -658,11 +658,11 @@ This is here to make the tiles around the station mininuke change when it's arme
if(disk_comfort_level >= 2) //Sleep tight, disky.
if(!(process_tick % 30))
visible_message("<span class='notice'>[src] sleeps soundly. Sleep tight, disky.</span>")
if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001))
else if(last_disk_move < world.time - 12000 && prob((world.time - 12000 - last_disk_move)*0.0001)) //Syndicate only cares about the disks being uncomfy
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop))
loneop.weight += 1
if(loneop.weight % 5 == 0)
// if(loneop.weight % 5 == 0)
// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono
log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
else
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -288,7 +288,7 @@
observer.started_as_observer = TRUE
src.client.respawn_observing = 1
src.client.lastrespawn = world.time + 1800 SECONDS //reset respawn.
src.client.lastrespawn = world.time + 180 SECONDS //reset respawn.
close_spawn_windows()
var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
to_chat(src, "<span class='notice'>Now teleporting.</span>")
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -289,7 +289,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(istype(loc, /obj/machinery/cryopod))
var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait 30 minutes before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
if(response != "Ghost")//darn copypaste
client.lastrespawn = world.time + 1800 SECONDS //set respawn time
client.lastrespawn = world.time + 180 SECONDS //set respawn time
return
var/obj/machinery/cryopod/C = loc
C.despawn_occupant()
code/modules/mob/mob.dm
+1 -1
View File
@@ -471,7 +471,7 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
qdel(M)
return
usr.client.lastrespawn = world.time + 1800 SECONDS
usr.client.lastrespawn = world.time + 180 SECONDS
usr.client.respawn_observing = 0
message_admins("[client.ckey] respawned.")
M.ckey = ckey //shamelessly copied to
hyperstation/code/datums/weather/oxygen_rain.dm
+3
View File
@@ -1,3 +1,5 @@
//GS13 Edit
/*
/datum/weather/oxygen_rain
name = "oxygen rain"
desc = "The weather of Layenia can be quite unpredictable. Given the natural low temperature of Layenia, the formation of natural croxygenic liquid gases is possible."
@@ -88,3 +90,4 @@
start_length = 130
end_sound = 'sound/weather/oxygenrain/inside/weak_end.ogg'
volume = 30
*/
icons/obj/tiles.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 21 KiB

tgui-next/packages/tgui/public/tgui.bundle.css
+1 -1
View File
File diff suppressed because one or more lines are too long