mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 04:22:39 +01:00
Merge branch 'upstream-master' into development-upstream
This commit is contained in:
Werner
+1
-1
@@ -4,7 +4,7 @@ sudo: false
|
||||
env:
|
||||
global:
|
||||
BYOND_MAJOR="512"
|
||||
BYOND_MINOR="1438"
|
||||
BYOND_MINOR="1453"
|
||||
MACRO_COUNT=77
|
||||
FLYWAY_BUILD="5.1.4"
|
||||
NODE_VERSION=10
|
||||
|
||||
@@ -123,16 +123,16 @@
|
||||
#define MOB_MINISCULE 1
|
||||
|
||||
#define BASE_MAX_NUTRITION 400
|
||||
#define HUNGER_FACTOR 0.025 // Factor of how fast mob nutrition decreases. Moved here from chemistry define
|
||||
#define HUNGER_FACTOR 0.04 // Factor of how fast mob nutrition decreases over time.
|
||||
|
||||
#define BASE_MAX_HYDRATION 600
|
||||
#define THIRST_FACTOR 0.05 // Factor of how fast mob hydration decreases. Moved here from chemistry define
|
||||
#define THIRST_FACTOR 0.02 // Factor of how fast mob hydration decreases over time.
|
||||
|
||||
#define CREW_MINIMUM_HYDRATION 50 // The minimum amount of nutrition a crewmember will spawn with.
|
||||
#define CREW_MAXIMUM_HYDRATION 100 // Same as above, but maximum.
|
||||
#define CREW_MINIMUM_HYDRATION BASE_MAX_HYDRATION * CREW_HYDRATION_SLIGHTLYTHIRSTY // The minimum amount of nutrition a crewmember will spawn with.
|
||||
#define CREW_MAXIMUM_HYDRATION BASE_MAX_HYDRATION * CREW_HYDRATION_HYDRATED // Same as above, but maximum.
|
||||
|
||||
#define CREW_MINIMUM_NUTRITION 50 // The minimum amount of nutrition a crewmember will spawn with.
|
||||
#define CREW_MAXIMUM_NUTRITION 100 // Same as above, but maximum.
|
||||
#define CREW_MINIMUM_NUTRITION BASE_MAX_NUTRITION * CREW_NUTRITION_SLIGHTLYHUNGRY // The minimum amount of nutrition a crewmember will spawn with.
|
||||
#define CREW_MAXIMUM_NUTRITION BASE_MAX_NUTRITION * CREW_NUTRITION_FULL // Same as above, but maximum.
|
||||
|
||||
//Note that all of this is relative to nutrition/max nutrition
|
||||
#define CREW_NUTRITION_OVEREATEN 0.95
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
/proc/game_log(category, text)
|
||||
diary << "\[[time_stamp()]] [game_id] [category]: [text][log_end]"
|
||||
|
||||
/proc/log_admin(text,level=5,ckey="",admin_key="",ckey_target="")
|
||||
/proc/log_admin(text,level=SEVERITY_NOTICE,ckey="",admin_key="",ckey_target="")
|
||||
admin_log.Add(text)
|
||||
if (config.log_admin)
|
||||
game_log("ADMIN", text)
|
||||
|
||||
@@ -478,8 +478,9 @@ var/list/admin_verbs_cciaa = list(
|
||||
var/mob/abstract/observer/ghost = mob
|
||||
if(ghost.can_reenter_corpse)
|
||||
ghost.reenter_corpse()
|
||||
log_admin("[src] reentered their corpose using aghost.",admin_key=key_name(src))
|
||||
else
|
||||
ghost << "<font color='red'>Error: Aghost: Can't reenter corpse, mentors that use adminHUD while aghosting are not permitted to enter their corpse again</font>"
|
||||
ghost << "<font color='red'>Error: Aghost: Can't reenter corpse.</font>"
|
||||
return
|
||||
|
||||
feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
@@ -496,7 +497,7 @@ var/list/admin_verbs_cciaa = list(
|
||||
if(!body.key)
|
||||
body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
|
||||
feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
log_admin("[src] aghosted.",admin_key=key_name(src))
|
||||
|
||||
/client/proc/invisimin()
|
||||
set name = "Invisimin"
|
||||
@@ -660,6 +661,7 @@ var/list/admin_verbs_cciaa = list(
|
||||
|
||||
var/list/traumas = subtypesof(/datum/brain_trauma)
|
||||
var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in traumas
|
||||
if(!result) return
|
||||
var/permanent = alert("Do you want to make the trauma unhealable?", "Permanently Traumatize", "Yes", "No")
|
||||
if(permanent == "Yes")
|
||||
permanent = TRUE
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
|
||||
/mob/living/carbon/Move(NewLoc, direct)
|
||||
. = ..()
|
||||
if(.)
|
||||
|
||||
if(.)
|
||||
if(src.stat != 2)
|
||||
if(src.nutrition)
|
||||
adjustNutritionLoss(nutrition_loss*0.1)
|
||||
|
||||
@@ -1685,7 +1685,7 @@
|
||||
var/regen = stamina_recovery * (1 - min(((oxyloss) / exhaust_threshold) + ((halloss) / exhaust_threshold), 1))
|
||||
if (regen > 0)
|
||||
stamina = min(max_stamina, stamina+regen)
|
||||
adjustNutritionLoss(stamina_recovery*0.9)
|
||||
adjustNutritionLoss(stamina_recovery*0.09)
|
||||
adjustHydrationLoss(stamina_recovery*0.18)
|
||||
if (client)
|
||||
hud_used.move_intent.update_move_icon(src)
|
||||
|
||||
@@ -55,6 +55,7 @@
|
||||
equip_slots |= slot_legcuffed
|
||||
|
||||
/datum/hud_data/diona
|
||||
has_hydration = 0
|
||||
has_internals = 0
|
||||
gear = list(
|
||||
"i_clothing" = list("loc" = ui_iclothing, "name" = "Uniform", "slot" = slot_w_uniform, "state" = "center", "toggle" = 1),
|
||||
|
||||
@@ -335,6 +335,8 @@
|
||||
sprint_cost_factor = 0.8
|
||||
climb_coeff = 1.3
|
||||
|
||||
max_hydration_factor = -1
|
||||
|
||||
/datum/species/diona/handle_sprint_cost(var/mob/living/carbon/H, var/cost)
|
||||
var/datum/dionastats/DS = H.get_dionastats()
|
||||
|
||||
|
||||
@@ -1237,7 +1237,8 @@ proc/is_blind(A)
|
||||
return TRUE
|
||||
|
||||
/mob/proc/adjustHydrationLoss(var/amount)
|
||||
if(max_nutrition <= 0)
|
||||
|
||||
if(max_hydration <= 0)
|
||||
return FALSE
|
||||
hydration = max(0,min(max_hydration,hydration - amount))
|
||||
|
||||
|
||||
@@ -119,9 +119,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
|
||||
death()
|
||||
|
||||
// Without enough blood you slowly go hungry and thirsty
|
||||
if(blood_volume < BLOOD_VOLUME_SAFE)
|
||||
adjustNutritionLoss(get_nutrition_mul(1,20))
|
||||
adjustHydrationLoss(get_hydration_mul(1,10))
|
||||
if(blood_volume <= BLOOD_VOLUME_SAFE)
|
||||
adjustNutritionLoss(get_nutrition_mul(1,5))
|
||||
adjustHydrationLoss(get_hydration_mul(1,13))
|
||||
|
||||
//Bleeding out
|
||||
var/blood_max = 0
|
||||
|
||||
@@ -117,6 +117,8 @@
|
||||
glass_name = "glass of coder fuckups"
|
||||
glass_desc = "A glass of distilled maintainer tears."
|
||||
|
||||
var/blood_to_ingest_scale = 2
|
||||
|
||||
/datum/reagent/alcohol/Destroy()
|
||||
if (caffeine_mod)
|
||||
QDEL_NULL(caffeine_mod)
|
||||
@@ -128,8 +130,8 @@
|
||||
L.adjust_fire_stacks((amount / (flammability_divisor || 1)) * (strength / 100))
|
||||
|
||||
/datum/reagent/alcohol/affect_blood(mob/living/carbon/M, alien, removed)
|
||||
M.adjustToxLoss(removed * 2)
|
||||
affect_ingest(M,alien,removed * 2)
|
||||
M.adjustToxLoss(removed * blood_to_ingest_scale * (strength/100) )
|
||||
affect_ingest(M,alien,removed * blood_to_ingest_scale)
|
||||
return
|
||||
|
||||
/datum/reagent/alcohol/affect_ingest(mob/living/carbon/M, alien, removed)
|
||||
|
||||
@@ -701,6 +701,7 @@
|
||||
var/caffeine = 0 // strength of stimulant effect, since so many drinks use it
|
||||
var/datum/modifier/modifier = null
|
||||
unaffected_species = IS_MACHINE
|
||||
var/blood_to_ingest_scale = 2
|
||||
|
||||
/datum/reagent/drink/Destroy()
|
||||
if (modifier)
|
||||
@@ -708,8 +709,8 @@
|
||||
return ..()
|
||||
|
||||
/datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
M.adjustToxLoss(removed) // Probably not a good idea; not very deadly though
|
||||
digest(M,alien,removed * 2, FALSE)
|
||||
M.adjustToxLoss(removed * blood_to_ingest_scale) // Probably not a good idea; not very deadly though
|
||||
digest(M,alien,removed * blood_to_ingest_scale, FALSE)
|
||||
|
||||
/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
digest(M,alien,removed)
|
||||
@@ -1434,6 +1435,8 @@
|
||||
glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
blood_to_ingest_scale = 1
|
||||
|
||||
/datum/reagent/drink/doctor_delight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
if(alien != IS_DIONA)
|
||||
@@ -1450,6 +1453,7 @@
|
||||
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
|
||||
reagent_state = SOLID
|
||||
nutrition = 1
|
||||
hydration = 0
|
||||
color = "#302000"
|
||||
taste_description = "dry and cheap noodles"
|
||||
|
||||
@@ -1460,6 +1464,7 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#302000"
|
||||
nutrition = 5
|
||||
hydration = 5
|
||||
adj_temp = 5
|
||||
taste_description = "wet and cheap noodles"
|
||||
|
||||
@@ -1470,6 +1475,7 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#302000"
|
||||
nutrition = 5
|
||||
hydration = 5
|
||||
taste_description = "wet and cheap noodles on fire"
|
||||
|
||||
/datum/reagent/drink/hell_ramen/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
@@ -1485,6 +1491,7 @@
|
||||
adj_temp = -5
|
||||
taste_description = "ice"
|
||||
taste_mult = 1.5
|
||||
hydration = 8
|
||||
|
||||
glass_icon_state = "iceglass"
|
||||
glass_name = "glass of ice"
|
||||
@@ -2463,6 +2470,9 @@
|
||||
glass_desc = "A drink that is guaranteed to knock you silly."
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
blood_to_ingest_scale = 1
|
||||
metabolism = REM * 5
|
||||
|
||||
/datum/reagent/alcohol/ethanol/neurotoxin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
if(alien != IS_DIONA)
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
return
|
||||
reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST)
|
||||
else
|
||||
if(!user.can_force_feed(target, src))
|
||||
if(!target.can_force_feed(user, src))
|
||||
return
|
||||
if(is_full)
|
||||
to_chat(user,span("warning","\The [target] can't stomach any more food!"))
|
||||
|
||||
@@ -56,6 +56,28 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">10 October 2018</h2>
|
||||
<h3 class="author">Arrow768 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">NanoTrasen Engineers have fixed issues such as missing holopads, newscasters, vents and access errors throughout the station</li>
|
||||
<li class="maptweak">The skylight has been readded to the psych wing.</li>
|
||||
</ul>
|
||||
<h3 class="author">BurgerBB updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixed a typo that caused hunger related hell to be unleashed upon players when sprinting a lot.</li>
|
||||
<li class="bugfix">Diona are no longer affected by thirst.</li>
|
||||
<li class="tweak">Adjusted starting hunger values so that people don't come to the station starving.</li>
|
||||
<li class="tweak">Increased the metabolism rate of Neurotoxin so it doesn't stun for 30 seconds when injected. Adjusted the injection strength of Doctor's Delight when injected.</li>
|
||||
<li class="tweak">Adjusted ramen and ice nutrition and hydration stats.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">09 October 2018</h2>
|
||||
<h3 class="author">BurgerBB updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixed forcefeeding logic in feeding people food.</li>
|
||||
<li class="tweak">Reverted nutrition loss from bloodloss changes to what it was before.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">08 October 2018</h2>
|
||||
<h3 class="author">PoZe updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
|
||||
@@ -6260,3 +6260,21 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- bugfix: Regular ERT members no longer has access to Admin Shuttle(HAP) blast door
|
||||
remote button. ERT commander and CCIA are the only people whose ID has access
|
||||
to it.
|
||||
2018-10-09:
|
||||
BurgerBB:
|
||||
- bugfix: Fixed forcefeeding logic in feeding people food.
|
||||
- tweak: Reverted nutrition loss from bloodloss changes to what it was before.
|
||||
2018-10-10:
|
||||
Arrow768:
|
||||
- bugfix: NanoTrasen Engineers have fixed issues such as missing holopads, newscasters,
|
||||
vents and access errors throughout the station
|
||||
- maptweak: The skylight has been readded to the psych wing.
|
||||
BurgerBB:
|
||||
- bugfix: Fixed a typo that caused hunger related hell to be unleashed upon players
|
||||
when sprinting a lot.
|
||||
- bugfix: Diona are no longer affected by thirst.
|
||||
- tweak: Adjusted starting hunger values so that people don't come to the station
|
||||
starving.
|
||||
- tweak: Increased the metabolism rate of Neurotoxin so it doesn't stun for 30 seconds
|
||||
when injected. Adjusted the injection strength of Doctor's Delight when injected.
|
||||
- tweak: Adjusted ramen and ice nutrition and hydration stats.
|
||||
|
||||
@@ -36957,6 +36957,9 @@
|
||||
icon_state = "corner_white";
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/medbay)
|
||||
"brx" = (
|
||||
@@ -39382,6 +39385,9 @@
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/surgeryobs)
|
||||
"bwm" = (
|
||||
@@ -51417,6 +51423,7 @@
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/maintenance/disposal)
|
||||
"ccf" = (
|
||||
@@ -51502,10 +51509,10 @@
|
||||
/area/quartermaster/mail_room)
|
||||
"ccz" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/maintenance/disposal)
|
||||
"ccB" = (
|
||||
@@ -51700,7 +51707,11 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
dir = 1;
|
||||
external_pressure_bound = 102;
|
||||
external_pressure_bound_default = 102;
|
||||
icon_state = "map_vent_in";
|
||||
pump_direction = 0
|
||||
},
|
||||
/obj/machinery/light/small/emergency{
|
||||
dir = 8
|
||||
@@ -58798,6 +58809,12 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/bar)
|
||||
"gnU" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/hologram/holopad,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"gql" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/random/junk,
|
||||
@@ -58945,8 +58962,8 @@
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Kitchen Maintenance";
|
||||
req_access = null;
|
||||
req_one_access = list(12,28)
|
||||
req_access = list(28);
|
||||
req_one_access = null
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
@@ -61115,6 +61132,11 @@
|
||||
/obj/structure/ore_box,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/refinery)
|
||||
"lUb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/hologram/holopad,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/lobby)
|
||||
"maz" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
@@ -63187,6 +63209,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/chemistry)
|
||||
"xCL" = (
|
||||
/obj/machinery/hologram/holopad,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/mail_room)
|
||||
"xDz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
@@ -63531,6 +63557,9 @@
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/storage/box/donut,
|
||||
/obj/effect/floor_decal/corner/white/diagonal,
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/crew_quarters/medbreak)
|
||||
"ygU" = (
|
||||
@@ -64347,6 +64376,9 @@
|
||||
icon_state = "tube1";
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/crew_quarters/heads/cmo)
|
||||
"yiC" = (
|
||||
@@ -91034,7 +91066,7 @@ ykg
|
||||
bXo
|
||||
mEE
|
||||
mEE
|
||||
mEE
|
||||
lUb
|
||||
mEE
|
||||
mEE
|
||||
mEE
|
||||
@@ -93101,7 +93133,7 @@ xIJ
|
||||
xIJ
|
||||
cbA
|
||||
cbU
|
||||
cct
|
||||
xCL
|
||||
cct
|
||||
cct
|
||||
amD
|
||||
@@ -93609,7 +93641,7 @@ cib
|
||||
pDO
|
||||
cqv
|
||||
cqA
|
||||
cqA
|
||||
gnU
|
||||
cqO
|
||||
cqV
|
||||
xIJ
|
||||
|
||||
@@ -1500,19 +1500,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/library)
|
||||
"cN" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
req_access = list(12)
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/library)
|
||||
"cO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -1563,35 +1550,6 @@
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/library)
|
||||
"cU" = (
|
||||
/obj/structure/disposalpipe/down{
|
||||
icon_state = "pipe-d";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/library)
|
||||
"cV" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/library)
|
||||
"cW" = (
|
||||
/obj/structure/disposalpipe/up{
|
||||
icon_state = "pipe-u";
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating{
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/library)
|
||||
"cX" = (
|
||||
/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
|
||||
icon_state = "up-scrubbers";
|
||||
@@ -5265,9 +5223,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/maintcentral)
|
||||
"ju" = (
|
||||
/turf/simulated/wall,
|
||||
/area/maintenance/library)
|
||||
"jv" = (
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 5
|
||||
@@ -5864,9 +5819,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/psych)
|
||||
"kw" = (
|
||||
/turf/simulated/wall,
|
||||
/area/medical/med_office)
|
||||
"kx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -6043,14 +5995,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/psych)
|
||||
"kN" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/light{
|
||||
icon_state = "tube1";
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/medical/med_office)
|
||||
"kO" = (
|
||||
/obj/structure/curtain,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
@@ -6357,14 +6301,6 @@
|
||||
/obj/structure/bed/chair,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/psych)
|
||||
"lo" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/light{
|
||||
icon_state = "tube1";
|
||||
dir = 2
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/medical/med_office)
|
||||
"lp" = (
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
icon_state = "corner_white";
|
||||
@@ -7033,6 +6969,10 @@
|
||||
/obj/effect/decal/remains,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/training)
|
||||
"zY" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/medical/psych)
|
||||
"FK" = (
|
||||
/obj/effect/landmark/dungeon_spawn,
|
||||
/turf/unsimulated/chasm_mask,
|
||||
@@ -7055,17 +6995,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/medbay)
|
||||
"GT" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/simulated/open,
|
||||
/area/medical/med_office)
|
||||
"Hl" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/simulated/open,
|
||||
/area/medical/med_office)
|
||||
"Hm" = (
|
||||
/turf/simulated/open,
|
||||
/area/medical/med_office)
|
||||
"HV" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -7208,6 +7137,16 @@
|
||||
roof_type = null
|
||||
},
|
||||
/area/maintenance/library)
|
||||
"PT" = (
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/psych)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -44599,11 +44538,11 @@ hZ
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -44856,11 +44795,11 @@ kA
|
||||
kK
|
||||
kU
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -45113,11 +45052,11 @@ kB
|
||||
kL
|
||||
kL
|
||||
ke
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -45370,11 +45309,11 @@ kB
|
||||
kM
|
||||
kV
|
||||
kg
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -45627,13 +45566,13 @@ kC
|
||||
kO
|
||||
kO
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
zY
|
||||
zY
|
||||
zY
|
||||
zY
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -45884,13 +45823,13 @@ kB
|
||||
kP
|
||||
kU
|
||||
kY
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
zY
|
||||
mr
|
||||
hZ
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
@@ -46141,14 +46080,14 @@ kB
|
||||
kL
|
||||
kL
|
||||
kg
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
zY
|
||||
mr
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
@@ -46393,19 +46332,19 @@ ab
|
||||
ab
|
||||
ab
|
||||
hZ
|
||||
jA
|
||||
PT
|
||||
kD
|
||||
kQ
|
||||
kV
|
||||
hZ
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
zY
|
||||
mr
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
hZ
|
||||
mr
|
||||
mr
|
||||
@@ -46655,14 +46594,14 @@ kE
|
||||
hZ
|
||||
hZ
|
||||
hZ
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
mr
|
||||
zY
|
||||
mr
|
||||
hZ
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
hZ
|
||||
mr
|
||||
mr
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ if [[ $DM == "" ]]; then
|
||||
exit 3
|
||||
fi
|
||||
|
||||
"$DM" $dmepath.mdme | tee build_log.txt
|
||||
"$DM" $dmepath.mdme | grep --invert-match -E "^including.*\.dmm?\$" | tee build_log.txt
|
||||
retval=$?
|
||||
|
||||
if [[ $retval == 0 ]]; then
|
||||
|
||||
Reference in New Issue
Block a user