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

Merge pull request #14 from Citadel-Station-13/master

Browse Source 
o
This commit is contained in:
YakumoChen
2020-12-19 05:27:21 -05:00
committed by GitHub
parent 0c9b829f87 b37d948358
commit ed98b71e5b
21 changed files with 140 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+24 -59
View File
@@ -2981,14 +2981,14 @@
/turf/open/floor/plating,
/area/security/main)
"afS" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig EVA Storage";
req_access_txt = "3"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
name = "Brig EVA Storage";
req_access_txt = "1"
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"afT" = (
@@ -37536,33 +37536,21 @@
/area/maintenance/aft)
"bKK" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/medical/medbay/central";
dir = 4;
name = "Medbay APC";
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/aft)
"bKL" = (
/obj/structure/disposalpipe/segment{
dir = 10
/obj/machinery/power/apc{
areastring = "/area/medical/medbay/central";
dir = 1;
name = "Medbay Central APC";
pixel_y = 24
},
/obj/structure/cable{
icon_state = "2-8"
icon_state = "0-2"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plating,
/area/maintenance/aft)
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bKM" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -46386,7 +46374,6 @@
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
pixel_y = 30
@@ -46394,6 +46381,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cig" = (
@@ -46553,7 +46541,6 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"ciF" = (
@@ -53254,27 +53241,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"cTL" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cTM" = (
/obj/machinery/power/apc{
areastring = "/area/maintenance/department/medical/morgue";
dir = 4;
name = "Morgue Maintenance APC";
pixel_x = 26
},
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cTO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -55873,7 +55839,6 @@
"juy" = (
/obj/structure/mopbucket,
/obj/item/mop,
/obj/item/reagent_containers/spray/cleaner,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"juG" = (
@@ -98153,9 +98118,9 @@ cCQ
cCS
chg
cCS
bLK
bLK
bLK
bMK
bMK
bMK
gXs
aaa
aaa
@@ -98667,9 +98632,9 @@ aaf
bMK
chg
bMK
bLK
bLK
bLK
bMK
bMK
bMK
aaf
aoV
aoV
@@ -99399,8 +99364,8 @@ bfK
bfK
bfK
bof
bhh
bsx
bKL
brf
btV
bvh
bwH
@@ -99671,7 +99636,7 @@ bDR
bDR
bIn
bJC
bKL
bUZ
bLT
bLT
bLT
@@ -101965,7 +101930,7 @@ bfL
bhp
biB
biB
cTL
biB
bkU
bmX
bpE
@@ -102222,7 +102187,7 @@ bfL
bhq
bhm
bkb
cTM
bhm
bla
bmZ
bpH
_maps/map_files/CogStation/CogStation.dmm
+3 -2
View File
@@ -21880,7 +21880,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/secure_construction)
"aVY" = (
@@ -70916,8 +70916,9 @@
/area/science/mixing)
"guK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/lattice,
/turf/open/space/basic,
/area/space)
/area/space/nearstation)
"gDY" = (
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
_maps/map_files/Deltastation/DeltaStation2.dmm
+4 -4
View File
@@ -49390,7 +49390,7 @@
},
/obj/machinery/door/airlock/security/glass{
name = "Security E.V.A. Storage";
req_access_txt = "3"
req_access_txt = "1"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -81571,12 +81571,12 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"cHt" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/status_display/ai{
pixel_y = -32
},
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/storage)
"cHu" = (
@@ -110341,8 +110341,8 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop Out";
dir = 4
dir = 4;
name = "Space Loop Out"
},
/turf/open/floor/plasteel,
/area/science/mixing)
_maps/map_files/KiloStation/KiloStation.dmm
+3 -3
View File
@@ -14492,7 +14492,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"aym" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -14503,6 +14502,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ayn" = (
@@ -85507,8 +85507,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop Out";
dir = 8
dir = 8;
name = "Space Loop Out"
},
/turf/open/floor/plating{
icon_state = "panelscorched"
_maps/map_files/LambdaStation/lambda.dmm
+9 -9
View File
@@ -53981,8 +53981,8 @@
pixel_y = -26
},
/obj/structure/cable,
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/storage_shared)
"cvh" = (
@@ -67078,12 +67078,12 @@
/area/engine/atmos)
"kgv" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plasteel/stairs/old,
/area/maintenance/department/medical)
@@ -71237,12 +71237,12 @@
"tcW" = (
/obj/structure/stairs/west,
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/department/medical)
_maps/map_files/MetaStation/MetaStation.dmm
+7 -7
View File
@@ -4548,7 +4548,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
name = "Security E.V.A. Storage";
req_access_txt = "3"
req_access_txt = "1"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -15223,7 +15223,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCN" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = -30
@@ -15231,6 +15230,7 @@
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel{
dir = 1
},
@@ -48921,7 +48921,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"bTi" = (
/obj/machinery/vending/wardrobe/atmos_wardrobe,
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"bTk" = (
@@ -82905,8 +82905,8 @@
/area/medical/morgue)
"tID" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop Out";
dir = 4
dir = 4;
name = "Space Loop Out"
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
@@ -83325,8 +83325,8 @@
/area/maintenance/port/aft)
"xHA" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop In";
dir = 8
dir = 8;
name = "Space Loop In"
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
_maps/map_files/OmegaStation/OmegaStation.dmm
+1 -5
View File
@@ -24502,10 +24502,6 @@
/obj/effect/turf_decal/loading_area{
dir = 1
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
@@ -25146,13 +25142,13 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aNg" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/sign/warning/nosmoking{
pixel_y = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aNh" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+3 -3
View File
@@ -46837,7 +46837,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cdL" = (
@@ -54462,8 +54462,8 @@
/area/maintenance/department/security/brig)
"gjv" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop In";
dir = 1
dir = 1;
name = "Space Loop In"
},
/turf/open/floor/plating,
/area/maintenance/department/science)
_maps/map_files/Snaxi/Snaxi.dmm
+1 -1
View File
@@ -14395,7 +14395,6 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/camera{
c_tag = "Engineering Access"
},
@@ -14403,6 +14402,7 @@
name = "Station Intercom (General)";
pixel_y = 20
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
code/__HELPERS/shell.dm
+2
View File
@@ -13,6 +13,7 @@
var/err_file = ""
var/static/list/interpreters = list("[MS_WINDOWS]" = "cmd /c", "[UNIX]" = "sh -c")
var/interpreter = interpreters["[world.system_type]"]
log_subsystem("SHELL", "Executing command [command]")
if(interpreter)
for(var/seo_id in shelleo_ids)
if(!shelleo_ids[seo_id])
@@ -36,6 +37,7 @@
else
CRASH("Operating System: [world.system_type] not supported") // If you encounter this error, you are encouraged to update this proc with support for the new operating system
. = list(errorcode, stdout, stderr)
log_subsystem("SHELL", "Finished execution: [errorcode], [stdout], [stderr]")
#undef SHELLEO_NAME
#undef SHELLEO_ERR
#undef SHELLEO_OUT
code/datums/components/storage/concrete/rped.dm
+52 -2
View File
@@ -16,6 +16,32 @@
to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
return FALSE
/datum/component/storage/concrete/rped/quick_empty(mob/M)
var/atom/A = parent
if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated())
return
if(check_locked(null, M, TRUE))
return FALSE
A.add_fingerprint(M)
var/list/things = contents()
var/lowest_rating = INFINITY
for(var/obj/item/B in things)
if(B.get_part_rating() < lowest_rating)
lowest_rating = B.get_part_rating()
for(var/obj/item/B in things)
if(B.get_part_rating() > lowest_rating)
things.Remove(B)
if(lowest_rating == INFINITY)
to_chat(M, "<span class='notice'>There's no parts to dump out from [parent].</span>")
return
to_chat(M, "<span class='notice'>You start dumping out tier/cell rating [lowest_rating] parts from [parent].</span>")
var/turf/T = get_turf(A)
var/datum/progressbar/progress = new(M, length(things), T)
while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
stoplag(1)
qdel(progress)
A.do_squish(0.8, 1.2)
/datum/component/storage/concrete/bluespace/rped
collection_mode = COLLECT_EVERYTHING
allow_quick_gather = TRUE
@@ -33,5 +59,29 @@
to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
return FALSE
/datum/component/storage/concrete/cyborg/rped
max_items = 150
/datum/component/storage/concrete/bluespace/rped/quick_empty(mob/M)
var/atom/A = parent
if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated())
return
if(check_locked(null, M, TRUE))
return FALSE
A.add_fingerprint(M)
var/list/things = contents()
var/lowest_rating = INFINITY
for(var/obj/item/B in things)
if(B.get_part_rating() < lowest_rating)
lowest_rating = B.get_part_rating()
for(var/obj/item/B in things)
if(B.get_part_rating() > lowest_rating)
things.Remove(B)
if(lowest_rating == INFINITY)
to_chat(M, "<span class='notice'>There's no parts to dump out from [parent].</span>")
return
to_chat(M, "<span class='notice'>You start dumping out tier/cell rating [lowest_rating] parts from [parent].</span>")
var/turf/T = get_turf(A)
var/datum/progressbar/progress = new(M, length(things), T)
while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
stoplag(1)
qdel(progress)
A.do_squish(0.8, 1.2)
code/game/objects/items/devices/polycircuit.dm
+2 -2
View File
@@ -18,8 +18,8 @@
else
if(zero_amount())
return
chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) in list("airlock","firelock","fire alarm","air alarm","APC")
if(zero_amount())
chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) as null|anything in list("airlock","firelock","fire alarm","air alarm","APC")
if(zero_amount() || !chosen_circuit || !in_range(src,user))
return
switch(chosen_circuit)
if("airlock")
code/modules/atmospherics/machinery/datum_pipeline.dm
+1 -1
View File
@@ -206,7 +206,7 @@
. = other_airs + air
if(null in .)
stack_trace("[src]([REF(src)]) has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().")
return listclearnulls(.)
listclearnulls(.)
/datum/pipeline/proc/empty()
for(var/datum/gas_mixture/GM in get_all_connected_airs())
code/modules/integrated_electronics/core/helpers.dm
+4 -1
View File
@@ -32,7 +32,10 @@
/obj/item/integrated_circuit/proc/get_pin_data(pin_type, pin_number)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
return pin.get_data()
var/data = pin.get_data()
if(istext(data))
data = sanitize_text(data)
return data
/obj/item/integrated_circuit/proc/get_pin_data_as_type(pin_type, pin_number, as_type)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm
+4
View File
@@ -20,16 +20,20 @@
ckeys_allowed = list("poojawa")
extra = TRUE
extra_color_src = MUTCOLORS3
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/tails/mam_tails/sabresune
name = "Sabresune"
icon_state = "sabresune"
ckeys_allowed = list("poojawa")
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/tails_animated/mam_tails_animated/sabresune
name = "Sabresune"
icon_state = "sabresune"
ckeys_allowed = list("poojawa")
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN
/datum/sprite_accessory/mam_body_markings/sabresune
name = "Sabresune"
code/modules/projectiles/ammunition/energy/laser.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/item/ammo_casing/energy/xray
projectile_type = /obj/item/projectile/beam/xray
e_cost = 50
e_cost = 100
fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/ammo_casing/energy/mindflayer
code/modules/projectiles/projectile/beams.dm
+1 -1
View File
@@ -70,7 +70,7 @@
name = "\improper X-ray beam"
icon_state = "xray"
damage = 15
irradiate = 300
irradiate = 100
range = 15
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSCLOSEDTURF
html/changelogs/AutoChangeLog-pr-13763.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Hatterhat"
delete-after: True
changes:
- tweak: "RPEDs now drop their lowest part tier first when quick-emptied (used inhand)."
html/changelogs/AutoChangeLog-pr-13790.yml
+5
View File
@@ -0,0 +1,5 @@
author: "MrJWhit"
delete-after: True
changes:
- tweak: "Replaced engineering fuel tank with a large fuel tank"
- tweak: "Changed access to sec suit storage from armory access in every map to other security access"
html/changelogs/AutoChangeLog-pr-13804.yml
+4
View File
@@ -0,0 +1,4 @@
author: "timothyteakettle"
delete-after: True
changes:
- bugfix: "circuits get pin data proc is sanitized when text is returned as data"
html/changelogs/AutoChangeLog-pr-13808.yml
+5
View File
@@ -0,0 +1,5 @@
author: "Putnam3145"
delete-after: True
changes:
- tweak: "You can now exit polycircuit input"
- bugfix: "Polycircuits now check for range"