shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
DeltaFire
2021-07-01 01:32:25 +02:00
parent 1d3730e892 3cde84ff5f
commit 04a344ac7b
20 changed files with 129503 additions and 128589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+128296 -128274
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+2 -2
View File
@@ -111598,7 +111598,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
/obj/machinery/door/airlock/command{
name = "Quartermaster's Quarters";
req_access_txt = "41"
},
@@ -127746,7 +127746,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
/obj/machinery/door/airlock/command{
name = "Quartermaster's Office";
req_access_txt = "41"
},
_maps/map_files/MetaStation/MetaStation.dmm
+1 -1
View File
@@ -56562,7 +56562,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
/obj/machinery/door/airlock/command{
name = "Quartermaster";
req_access_txt = "41"
},
_maps/map_files/PubbyStation/PubbyStation.dmm
+475 -203
View File
File diff suppressed because it is too large Load Diff
_maps/templates/shelter_5.dmm
+480
View File
@@ -0,0 +1,480 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"cc" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"dH" = (
/obj/structure/chair/sofa/corp,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"fp" = (
/obj/machinery/smartfridge,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod/nonpowered)
"fC" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"fM" = (
/obj/structure/table/survival_pod,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/storage/bag/plants/portaseeder,
/obj/item/shovel/spade,
/obj/item/cultivator,
/obj/item/reagent_containers/spray/weedspray,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"fN" = (
/obj/structure/table/reinforced,
/obj/item/kitchen/knife,
/obj/item/kitchen/rollingpin,
/obj/machinery/reagentgrinder,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"gr" = (
/obj/machinery/vending/wallmed,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod/nonpowered)
"hr" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/drinks/beer,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"iu" = (
/obj/structure/curtain,
/obj/machinery/poweredfans,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"iD" = (
/obj/item/gps/computer,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"iY" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/nanotrasen,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"lO" = (
/obj/machinery/poweredfans,
/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"lW" = (
/obj/structure/chair/sofa/corp{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"mC" = (
/obj/structure/chair/sofa/corp{
dir = 8
},
/obj/machinery/light{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"mN" = (
/obj/machinery/power/rtg/advanced/fullupgrade,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"oo" = (
/obj/machinery/vending/dinnerware,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"pg" = (
/obj/machinery/shower{
dir = 8
},
/turf/open/floor/noslip,
/area/survivalpod/nonpowered)
"pF" = (
/obj/machinery/modular_computer/console/preset/civilian{
dir = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"qE" = (
/obj/machinery/washing_machine,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"rL" = (
/obj/structure/mirror,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod/nonpowered)
"rM" = (
/obj/structure/chair/sofa/corp/corner{
dir = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"rZ" = (
/obj/structure/sink{
pixel_y = 18
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"sN" = (
/obj/machinery/light{
dir = 8
},
/obj/structure/sink/kitchen{
dir = 4;
pixel_x = -10
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"td" = (
/obj/machinery/hydroponics/constructable/automagic,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"um" = (
/obj/structure/table/wood/fancy/monochrome,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"uR" = (
/obj/machinery/light,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"vU" = (
/obj/machinery/sleeper/survival_pod,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"wv" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"wI" = (
/obj/item/storage/fancy/candle_box,
/obj/structure/table/wood/fancy/blackred,
/obj/machinery/light{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"xC" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"zW" = (
/obj/machinery/vending/hydroseeds,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"BI" = (
/obj/structure/chair/sofa/corp/corner{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Cj" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"EV" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/nanotrasen,
/obj/item/toy/plush/mothplushie,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Fo" = (
/obj/machinery/smartfridge/survival_pod,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Fw" = (
/obj/structure/chair/sofa/corp{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"FE" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"FZ" = (
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod/nonpowered)
"JL" = (
/obj/machinery/door/window/survival_pod{
dir = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Lv" = (
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Ng" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Qr" = (
/obj/effect/spawner/structure/window/hollow/survival_pod,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Ro" = (
/obj/structure/chair/comfy/black{
dir = 4
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Ry" = (
/obj/structure/chair/sofa/corp/left,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Tc" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"TQ" = (
/obj/structure/fans,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Ub" = (
/obj/structure/chair/sofa/corp/corner{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Vp" = (
/obj/structure/table/reinforced,
/obj/machinery/dish_drive,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Ws" = (
/obj/structure/dresser,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Xh" = (
/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Xr" = (
/obj/machinery/door/airlock/survival_pod,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Xy" = (
/obj/machinery/light,
/obj/machinery/power/apc/auto_name/south,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"YH" = (
/obj/structure/table/survival_pod,
/obj/item/shovel,
/obj/item/pickaxe,
/obj/item/clothing/gloves/chameleon/insulated,
/obj/item/storage/toolbox/electrical,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
"Zd" = (
/obj/machinery/seed_extractor,
/turf/open/floor/pod/dark,
/area/survivalpod/nonpowered)
(1,1,1) = {"
FZ
FZ
FZ
FZ
FZ
FZ
FZ
FZ
Qr
Qr
Qr
Qr
FZ
"}
(2,1,1) = {"
FZ
pg
FE
FZ
EV
Ws
iY
FZ
BI
Fw
Fw
Ub
Qr
"}
(3,1,1) = {"
FZ
FZ
iu
FZ
Tc
Lv
uR
FZ
dH
um
um
lW
Qr
"}
(4,1,1) = {"
FZ
qE
JL
FZ
Lv
Lv
Ro
FZ
Ry
um
um
lW
Qr
"}
(5,1,1) = {"
rL
rZ
xC
Xh
Lv
Lv
pF
FZ
Lv
Cj
mC
rM
Qr
"}
(6,1,1) = {"
FZ
FZ
FZ
FZ
FZ
Xh
FZ
FZ
Xh
FZ
FZ
FZ
FZ
"}
(7,1,1) = {"
FZ
wv
sN
Lv
Xh
Lv
Lv
xC
Lv
FE
Lv
Lv
lO
"}
(8,1,1) = {"
FZ
fN
Lv
oo
FZ
FZ
Xh
FZ
FZ
FZ
FZ
Xr
FZ
"}
(9,1,1) = {"
FZ
fC
Lv
cc
FZ
fM
Lv
td
FZ
TQ
vU
Lv
FZ
"}
(10,1,1) = {"
FZ
hr
Lv
Vp
FZ
zW
Lv
td
gr
YH
Lv
Xy
FZ
"}
(11,1,1) = {"
FZ
Lv
Lv
Lv
fp
Lv
Lv
td
FZ
Fo
Lv
Lv
FZ
"}
(12,1,1) = {"
FZ
Ng
wI
Ng
FZ
Zd
xC
td
FZ
iD
Lv
mN
FZ
"}
(13,1,1) = {"
FZ
Qr
FZ
Qr
FZ
FZ
FZ
FZ
FZ
FZ
FZ
FZ
FZ
"}
code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+10
View File
@@ -72,6 +72,16 @@
category = CAT_WEAPONRY
subcategory = CAT_MELEE
/datum/crafting_recipe/newsbaton
name = "Newspaper Baton"
result = /obj/item/melee/classic_baton/telescopic/newspaper
reqs = list(/obj/item/melee/classic_baton/telescopic = 1,
/obj/item/newspaper = 1,
/obj/item/stack/sticky_tape = 2)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_MELEE
/datum/crafting_recipe/bokken
name = "Training Bokken"
result = /obj/item/melee/bokken
code/game/objects/items/melee/misc.dm
+12
View File
@@ -453,6 +453,18 @@
playsound(src.loc, on_sound, 50, 1)
add_fingerprint(user)
/obj/item/melee/classic_baton/telescopic/newspaper
name = "The Daily Whiplash"
desc = "A newspaper wrapped around a telescopic baton in such a way that it looks like you're beating people with a rolled up newspaper."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "newspaper"
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
on_sound = 'sound/weapons/batonextend.ogg'
on_icon_state = "newspaper2"
off_icon_state = "newspaper"
on_item_state = "newspaper"
/obj/item/melee/classic_baton/telescopic/contractor_baton
name = "contractor baton"
desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
code/game/objects/items/plushes.dm
+118 -44
View File
@@ -612,6 +612,12 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
icon_state = "kobold"
item_state = "kobold"
/obj/item/toy/plush/lizardplushie/kobold
name = "spacelizard plushie"
desc = "An adorable stuffed toy that resembles a lizard in a suit."
icon_state = "plushie_spacelizard"
item_state = "plushie_spacelizard"
/obj/item/toy/plush/nukeplushie
name = "operative plushie"
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
@@ -643,17 +649,17 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
/obj/item/toy/plush/beeplushie
name = "bee plushie"
desc = "A cute toy that resembles an even cuter bee."
icon_state = "plushie_h"
item_state = "plushie_h"
icon_state = "plushie_bee"
item_state = "plushie_bee"
attack_verb = list("stung")
gender = FEMALE
squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)
/obj/item/toy/plush/mothplushie
name = "insect plushie"
name = "moth plushie"
desc = "An adorable stuffed toy that resembles some kind of insect."
icon_state = "bumble"
item_state = "bumble"
icon_state = "moff"
item_state = "moff"
squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1)
can_random_spawn = FALSE
@@ -665,6 +671,20 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
attack_verb = list("lit", "flickered", "flashed")
squeak_override = list('sound/weapons/magout.ogg' = 1)
/obj/item/toy/plush/drake
name = "drake plushie"
desc = "A large beast from lavaland turned into a marketable plushie!"
icon_state = "drake"
item_state = "drake"
attack_verb = list("bit", "devoured", "burned")
/obj/item/toy/plush/deer
name = "deer plushie"
desc = "Oh deer, a plushie!"
icon_state = "deer"
item_state = "deer"
attack_verb = list("bleated", "rammed", "kicked")
/obj/item/toy/plush/box
name = "cardboard plushie"
desc = "A toy box plushie, it holds cotten. Only a baddie would place a bomb through the postal system..."
@@ -694,7 +714,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
attack_verb = list("scanned", "beeped", "stared")
/obj/item/toy/plush/borgplushie
name = "robot plushie"
name = "K9 plushie"
desc = "An adorable stuffed toy of a robot."
icon_state = "securityk9"
item_state = "securityk9"
@@ -702,25 +722,28 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
squeak_override = list('sound/machines/beep.ogg' = 1)
/obj/item/toy/plush/borgplushie/medihound
name = "medihound plushie"
icon_state = "medihound"
item_state = "medihound"
/obj/item/toy/plush/borgplushie/scrubpuppy
name = "scrubpuppy plushie"
icon_state = "scrubpuppy"
item_state = "scrubpuppy"
/obj/item/toy/plush/borgplushie/pupdozer
name = "pupdozer plushie"
icon_state = "pupdozer"
item_state = "pupdozer"
/obj/item/toy/plush/aiplush
name = "AI plushie"
desc = "A little stuffed toy AI core... it appears to be malfunctioning."
icon_state = "exo"
item_state = "exo"
icon_state = "malfai"
item_state = "malfai"
attack_verb = list("hacked", "detonated", "overloaded")
squeak_override = list('sound/machines/beep.ogg' = 9, 'sound/machines/buzz-two.ogg' = 1)
/obj/item/toy/plush/mammal/fox
icon_state = "fox"
item_state = "fox"
/obj/item/toy/plush/snakeplushie
name = "snake plushie"
desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
@@ -732,6 +755,72 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
/obj/item/toy/plush/mammal
name = "mammal plushie"
desc = "An adorable stuffed toy resembling some sort of crew member."
icon_state = "ych"
item_state = "ych"
can_random_spawn = FALSE
/obj/item/toy/plush/mammal/fox
name = "fox plushie"
desc = "An adorable stuffed toy resembling a fox."
icon_state = "fox"
item_state = "fox"
attack_verb = list("yipped", "geckered", "yapped")
/obj/item/toy/plush/mammal/dog
name = "dog plushie"
icon_state = "corgi"
item_state = "corgi"
desc = "An adorable stuffed toy that resembles a dog."
attack_verb = list("barked", "boofed", "borked")
squeak_override = list(
'modular_citadel/sound/voice/bark1.ogg' = 1,
'modular_citadel/sound/voice/bark2.ogg' = 1
)
/obj/item/toy/plush/mammal/dog/fcorgi
name = "corgi plushie"
icon_state = "girlycorgi"
item_state = "girlycorgi"
desc = "An adorable stuffed toy that resembles a dog. This one dons a pink ribbon."
/obj/item/toy/plush/mammal/dog/borgi
name = "borgi plushie"
icon_state = "borgi"
item_state = "borgi"
desc = "An adorable stuffed toy that resembles a robot dog."
/obj/item/toy/plush/xeno
name = "xenohybrid plushie"
desc = "An adorable stuffed toy that resembles a xenomorphic crewmember."
icon_state = "xeno"
item_state = "xeno"
squeak_override = list('sound/voice/hiss2.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/bird
name = "bird plushie"
desc = "An adorable stuffed plushie that resembles an avian."
icon_state = "bird"
item_state = "bird"
attack_verb = list("peeped", "beeped", "poofed")
squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/sergal
name = "sergal plushie"
desc = "An adorable stuffed plushie that resembles a sagaru."
icon_state = "sergal"
item_state = "sergal"
squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/catgirl
name = "feline plushie"
desc = "An adorable stuffed toy that resembles a feline."
icon_state = "cat"
item_state = "cat"
attack_verb = list("headbutt", "scritched", "bit")
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/catgirl/fermis
@@ -742,40 +831,25 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
attack_verb = list("cuddled", "petpatted", "wigglepurred")
squeak_override = list('modular_citadel/sound/voice/merowr.ogg' = 1)
/obj/item/toy/plush/xeno
name = "xenohybrid plushie"
desc = "An adorable stuffed toy that resmembles a xenomorphic crewmember."
squeak_override = list('sound/voice/hiss2.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/teddybear
name = "teddy"
desc = "It's a teddy bear!"
icon_state = "teddy"
item_state = "teddy"
/obj/item/toy/plush/bird
name = "bird plushie"
desc = "An adorable stuffed plushie that resembles an avian."
attack_verb = list("peeped", "beeped", "poofed")
squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/sergal
name = "sergal plushie"
desc = "An adorable stuffed plushie that resembles a sagaru."
squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/mammal/dog
desc = "An adorable stuffed toy that resembles a canine."
attack_verb = list("barked", "boofed", "borked")
squeak_override = list(
'modular_citadel/sound/voice/bark1.ogg' = 1,
'modular_citadel/sound/voice/bark2.ogg' = 1
)
/obj/item/toy/plush/catgirl
name = "feline plushie"
desc = "An adorable stuffed toy that resembles a feline."
attack_verb = list("headbutt", "scritched", "bit")
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)
can_random_spawn = FALSE
/obj/item/toy/plush/crab
name = "crab plushie"
desc = "Fewer pinches than a real one, but it still clicks."
icon_state = "crab"
item_state = "crab"
attack_verb = list("clicked", "clacked", "pinched")
/obj/item/toy/plush/gondola
name = "gondola plushie"
desc = "Just looking at it seems to calm you down. Please do not eat it though."
icon_state = "gondola"
item_state = "gondola"
attack_verb = list("calmed", "smiled", "peaced")
/obj/item/toy/plush/hairball
name = "Hairball"
code/modules/jobs/job_types/head_of_personnel.dm
+4 -4
View File
@@ -23,14 +23,14 @@
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY)
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/quartermaster.dm
+1 -1
View File
@@ -25,7 +25,7 @@
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING,
ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS, ACCESS_HEADS)
paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck.
paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck. //alright i'll agree to that -qweq
paycheck_department = ACCOUNT_CAR
display_order = JOB_DISPLAY_ORDER_QUARTERMASTER
code/modules/mining/equipment/survival_pod.dm
+5
View File
@@ -89,6 +89,11 @@
name = "large empty capsule"
desc = "An extremly large capsule which requires power. Useful for projects all over."
template_id = "shelter_delta"
/obj/item/survivalcapsule/luxury/penthouse
name = "penthouse bluespace sheler capsule"
desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to make a small home in lavaland."
template_id = "shelter_epsilon"
//Pod objects
//Window
code/modules/mining/lavaland/necropolis_chests.dm
+36 -56
View File
@@ -61,37 +61,32 @@
new /obj/item/guardiancreator(src)
/obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents()
var/loot = rand(1,11)
var/loot = rand(1,10)
switch(loot)
if(1)
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(2)
new /obj/item/katana/lavaland(src)
if(3)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src)
else
new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src)
if(4)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src)
if(5)
if(4)
new /obj/item/nullrod/scythe/talking(src)
if(6)
if(5)
new /obj/item/nullrod/armblade(src)
if(7)
if(6)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src)
if(8)
if(7)
new /obj/item/grenade/clusterbuster/inferno(src)
if(9)
if(8)
new /obj/item/gun/magic/wand/book/shock(src)
if(10)
if(9)
new /obj/item/gun/magic/wand/book/page(src)
if(11)
if(10)
new /obj/item/gun/magic/wand/book/spark(src)
/obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents()
var/loot = rand(1,14)
var/loot = rand(1,12)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -106,31 +101,21 @@
if(6)
new /obj/item/jacobs_ladder(src)
if(7)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
else
new /obj/item/disk/design_disk/modkit_disc/bounty(src)
if(8)
new /obj/item/wisp_lantern(src)
if(9)
if(8)
new /obj/item/pickaxe/rosegold(src)
if(10)
if(9)
new /obj/item/bedsheet/cosmos(src)
new /obj/item/melee/skateboard/hoverboard(src)
if(11)
if(10)
new /obj/item/disk/tech_disk/illegal(src)
if(12)
if(11)
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(13)
if(12)
new /obj/item/katana/lavaland(src)
if(14)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src)
else
new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src)
/obj/structure/closet/crate/necropolis/tendril/all/PopulateContents()
var/loot = rand(1,29)
var/loot = rand(1,28)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -145,56 +130,51 @@
if(6)
new /obj/item/jacobs_ladder(src)
if(7)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
else
new /obj/item/disk/design_disk/modkit_disc/bounty(src)
if(8)
new /obj/item/wisp_lantern(src)
if(9)
if(8)
new /obj/item/pickaxe/rosegold(src)
if(10)
if(9)
new /obj/item/bedsheet/cosmos(src)
new /obj/item/melee/skateboard/hoverboard(src)
if(11)
if(10)
new /obj/item/disk/tech_disk/illegal(src)
if(12)
if(11)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src)
if(13)
if(12)
new /obj/item/nullrod/scythe/talking(src)
if(14)
if(13)
new /obj/item/nullrod/armblade(src)
if(15)
if(14)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src)
if(16)
if(15)
new /obj/item/grenade/clusterbuster/inferno(src)
if(17)
if(16)
new /obj/item/gun/magic/wand/book/shock(src)
if(18)
if(17)
new /obj/item/gun/magic/wand/book/page(src)
if(19)
if(18)
new /obj/item/gun/magic/wand/book/spark(src)
if(20)
if(19)
new /obj/item/soulstone/anybody(src)
if(21)
if(20)
new /obj/item/rod_of_asclepius(src)
if(22)
if(21)
new /obj/item/organ/heart/cursed/wizard(src)
if(23)
if(22)
new /obj/item/book/granter/spell/summonitem(src)
if(24)
if(23)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
if(25)
if(24)
new /obj/item/clothing/neck/necklace/memento_mori(src)
if(26)
if(25)
new /obj/item/warp_cube/red(src)
if(27)
if(26)
new /obj/item/immortality_talisman(src)
if(28)
if(27)
new /obj/item/gun/magic/wand/book/healing(src)
if(29)
if(28)
new /obj/item/guardiancreator(src)
//KA modkit design discs
code/modules/mining/machine_vending.dm
+1
View File
@@ -57,6 +57,7 @@
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxury/elitebar, 10000),
new /datum/data/mining_equipment("Empty Capsule", /obj/item/survivalcapsule/luxury/empty, 5000),
new /datum/data/mining_equipment("Penthouse Capsule", /obj/item/survivalcapsule/luxury/penthouse, 15000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
code/modules/mining/shelters.dm
+11
View File
@@ -85,3 +85,14 @@
. = ..()
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
/datum/map_template/shelter/epsilon
name = "Shelter Epsilon"
shelter_id = "shelter_epsilon"
description = "A small apartment in the palm of your hand."
mappath = "_maps/templates/shelter_5.dmm"
/datum/map_template/shelter/epsilon/New()
. = ..()
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+4 -2
View File
@@ -40,8 +40,10 @@ Difficulty: Medium
ranged = 1
ranged_cooldown_time = 16
pixel_x = -16
crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye)
loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka)
crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye, /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe,
/obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater)
loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe,
/obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+4 -2
View File
@@ -26,8 +26,10 @@ Difficulty: Extremely Hard
speed = 20
move_to_delay = 20
ranged = TRUE
crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman)
loot = list(/obj/effect/decal/remains/plasma)
crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe,
/obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater)
loot = list(/obj/effect/decal/remains/plasma, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe,
/obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
html/changelog.html
+23
View File
@@ -50,6 +50,29 @@
-->
<div class="commit sansserif">
<h2 class="date">30 June 2021</h2>
<h3 class="author">WanderingFox95 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">More plushies in the code.</li>
<li class="imageadd">Nabbed some plushie sprites from Cit RP and TG and made some myself. Enjoy!</li>
<li class="rscadd">The Daily Whiplash (Newspaper Baton) is now available! (Using sticky tape to stick a newspaper onto a baton) Bap!</li>
<li class="imageadd">A rolled up newspaper sprite was provided.</li>
<li class="balance">Switched Gateway and Vault locations on Boxstation, bringing it more in line with other stations.</li>
</ul>
<h3 class="author">bunny232 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">The pubby xenobiology air/scrubber network is now isolated from the rest of the station</li>
</ul>
<h3 class="author">qweq12yt updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">HoP's cargo access was removed...</li>
</ul>
<h3 class="author">shellspeed1 updated:</h3>
<ul class="changes bgimages16">
<li class="balance">NT has lost experimental KA tech to miners who were lost in the field. Make sure to try and recover it.</li>
<li class="rscadd">Adds an extremely expensive survival pod to mining for people to work towards. Get to work cracking rocks today.</li>
</ul>
<h2 class="date">28 June 2021</h2>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+20
View File
@@ -29586,3 +29586,23 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Carrots are good for your eyes - but eyes are also good for your carrots.
Adds the googly eyes trait to walkingshrooms (Oculary Mimicry)
- imageadd: Googly Eyes - they make everything better.
2021-06-30:
WanderingFox95:
- rscadd: More plushies in the code.
- imageadd: Nabbed some plushie sprites from Cit RP and TG and made some myself.
Enjoy!
- rscadd: The Daily Whiplash (Newspaper Baton) is now available! (Using sticky tape
to stick a newspaper onto a baton) Bap!
- imageadd: A rolled up newspaper sprite was provided.
- balance: Switched Gateway and Vault locations on Boxstation, bringing it more
in line with other stations.
bunny232:
- rscadd: The pubby xenobiology air/scrubber network is now isolated from the rest
of the station
qweq12yt:
- rscdel: HoP's cargo access was removed...
shellspeed1:
- balance: NT has lost experimental KA tech to miners who were lost in the field.
Make sure to try and recover it.
- rscadd: Adds an extremely expensive survival pod to mining for people to work
towards. Get to work cracking rocks today.
icons/obj/bureaucracy.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

icons/obj/plushes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 24 KiB