cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-master' into upstream-development

Browse Source
This commit is contained in:
Werner
2018-10-08 20:50:47 +02:00
parent 16eae6c246 61b3d6cf3d
commit bb98ae61b9
64 changed files with 6832 additions and 8242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -798,7 +798,7 @@ About the new airlock wires panel:
src.do_animate("spark")
src.stat |= BROKEN
var/check = src.open(1)
src.visible_message("\The [H] slices \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You slice \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You hear something sparking.")
H.visible_message("\The [H] slices \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You slice \the [src]'s controls[check ? ", ripping it open!" : ", breaking it!"]", "You hear something sparking.")
return
if(src.p_open)
user.set_machine(src)
code/game/machinery/doors/blast_door.dm
-3
View File
@@ -21,9 +21,6 @@
var/icon_state_closed = null
var/icon_state_closing = null
var/damage = BLAST_DOOR_CRUSH_DAMAGE
layer = 3.3
open_layer = 3.3
closed_layer = 3.4 // Above airlocks when closed
var/id = 1.0
dir = 1
code/modules/client/client procs.dm
+8 -5
View File
@@ -95,7 +95,7 @@
if(href_list["warnacknowledge"])
var/queryid = text2num(href_list["warnacknowledge"])
warnings_acknowledge(queryid)
if(href_list["notifacknowledge"])
var/queryid = text2num(href_list["notifacknowledge"])
notifications_acknowledge(queryid)
@@ -660,10 +660,13 @@
if (config.ipintel_email)
var/datum/ipintel/res = get_ip_intel(address)
if (config.ipintel_rating_kick && res.intel >= config.ipintel_rating_kick)
message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.")
log_admin("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.")
to_chat(src, "<span class='danger'>Usage of proxies is not permitted by the rules. You are being kicked because of this.</span>")
del(src)
if (!holder)
message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.")
log_admin("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.")
to_chat(src, "<span class='danger'>Usage of proxies is not permitted by the rules. You are being kicked because of this.</span>")
del(src)
else
message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.")
else if (res.intel >= config.ipintel_rating_bad)
message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.")
ip_intel = res.intel
code/modules/mob/living/carbon/human/examine.dm
+6 -3
View File
@@ -30,13 +30,16 @@
skipbody |= wear_mask.body_parts_covered
skipbody |= (wear_mask.body_parts_covered & FACE) ? HEAD : 0 // same as above
skipface |= wear_mask.flags_inv & HIDEFACE
if(w_uniform)
skipbody |= w_uniform.body_parts_covered
if(gloves)
skipbody |= gloves.body_parts_covered
if(shoes)
skipbody |= shoes.body_parts_covered
var/list/msg = list("<span class='info'>*---------*\nThis is ")
var/datum/gender/T = gender_datums[gender]
@@ -274,7 +277,7 @@
wound_flavor_text["[organ_descriptor]"] = "<span class='warning'><b>[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be.</b></span>\n"
else
continue
for(var/obj/item/organ/external/temp in organs)
if(temp)
if(skipbody & temp.body_part)
code/modules/mob/living/carbon/human/human_powers.dm
+2
View File
@@ -789,6 +789,8 @@
to_chat(src,"<span class='danger'>You incorporate \the [O] into your mass, repairing damage to your structure.</span>")
adjustBruteLoss(-10*O.amount)
adjustFireLoss(-10*O.amount)
if(!(species.flags & NO_BLOOD))
vessel.add_reagent("blood",20*O.amount)
qdel(O)
last_special = world.time + 50
code/modules/mob/living/carbon/human/life.dm
+27 -7
View File
@@ -951,7 +951,7 @@
else
if(overeatduration > 1)
overeatduration -= 2 //doubled the unfat rate
// hydration decrease
if(max_hydration > 0)
if (hydration > 0 && stat != 2)
@@ -1196,16 +1196,36 @@
if((life_tick % 3 == 0))
if(nutrition_icon)
var/nut_factor = max(0,min(nutrition / max_nutrition,1))
var/nutrition_icons = 5 //Misnomer, basically the highest nutrition icon value.
var/new_val = "nutrition[nutrition_icons - round(nut_factor*nutrition_icons)]"
var/nut_icon = 5 //5 to 0, with 5 being lowest, 0 being highest
if(nut_factor >= CREW_NUTRITION_OVEREATEN)
nut_icon = 0
else if (nut_factor >= CREW_NUTRITION_FULL)
nut_icon = 1
else if (nut_factor >= CREW_NUTRITION_SLIGHTLYHUNGRY)
nut_icon = 2
else if (nut_factor >= CREW_NUTRITION_HUNGRY)
nut_icon = 3
else if (nut_factor >= CREW_NUTRITION_VERYHUNGRY )
nut_icon = 4
var/new_val = "nutrition[nut_icon]"
if (nutrition_icon.icon_state != new_val)
nutrition_icon.icon_state = new_val
if(hydration_icon)
var/hyd_factor = max(0,min(hydration / max_hydration,1))
var/hydration_icons = 5 //Misnomer, basically the highest thirst icon value.
var/new_val = "thirst[hydration_icons - round(hyd_factor*hydration_icons)]"
var/hyd_icon = 5
if(hyd_factor >= CREW_HYDRATION_OVERHYDRATED)
hyd_icon = 0
else if(hyd_factor >= CREW_HYDRATION_HYDRATED)
hyd_icon = 1
else if(hyd_factor >= CREW_HYDRATION_SLIGHTLYTHIRSTY)
hyd_icon = 2
else if(hyd_factor >= CREW_HYDRATION_THIRSTY)
hyd_icon = 3
else if(hyd_factor >= CREW_HYDRATION_VERYTHIRSTY)
hyd_icon = 4
var/new_val = "thirst[hyd_icon]"
if (hydration_icon.icon_state != new_val)
hydration_icon.icon_state = new_val
hydration_icon.icon_state = new_val
if(pressure)
var/new_pressure = "pressure[pressure_alert]"
@@ -1653,7 +1673,7 @@
if (prob(1.5))
src << span("warning", "You feel hungry and exhausted, eat something to regain your energy!")
return
if (hydration <= 0)
if (prob(1.5))
src << span("warning", "You feel thirsty and exhausted, drink something to regain your energy!")
code/modules/mob/living/carbon/human/species/outsider/shadow.dm
+6
View File
@@ -89,6 +89,12 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
max_nutrition_factor = -1
max_hydration_factor = -1
hud_type = /datum/hud_data/construct
/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
spawn(1)
new /obj/effect/decal/cleanable/ash(H.loc)
code/modules/mob/living/carbon/human/species/outsider/undead.dm
+17 -1
View File
@@ -73,6 +73,12 @@
sprint_speed_factor = 0.3
exhaust_threshold = 0 //No oxyloss, so zero threshold
max_nutrition_factor = -1
max_hydration_factor = -1
hud_type = /datum/hud_data/construct
/mob/living/carbon/human/apparition/Initialize(mapload)
. = ..(mapload, "Apparition")
@@ -110,6 +116,12 @@
sprint_speed_factor = 0.3
exhaust_threshold = 0 //No oxyloss, so zero threshold
max_nutrition_factor = -1
max_hydration_factor = -1
hud_type = /datum/hud_data/construct
/datum/species/apparition/handle_death(var/mob/living/carbon/human/H)
set waitfor = 0
sleep(1)
@@ -175,7 +187,11 @@
sprint_speed_factor = 0.3
exhaust_threshold = 0 //No oxyloss, so zero threshold
inherent_verbs = list(/mob/living/carbon/human/proc/darkness_eyes)
inherent_verbs = list(/mob/living/carbon/human/proc/darkness_eyes, /mob/living/proc/devour)
allowed_eat_types = TYPE_ORGANIC | TYPE_HUMANOID
gluttonous = TRUE
/datum/species/zombie/handle_post_spawn(var/mob/living/carbon/human/H)
H.mutations.Add(CLUMSY)
code/modules/mob/living/carbon/human/species/species_attack.dm
+9 -1
View File
@@ -154,7 +154,15 @@
/datum/unarmed_attack/bite/infectious/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
..()
if(prob(25))
if(target && target.stat == DEAD)
return
if(target.internal_organs_by_name["zombie"])
to_chat(user, "<span class='danger'>You feel that \the [target] has been already infected!</span>")
var/infection_chance = 80
var/armor = target.run_armor_check(zone,"melee")
infection_chance -= armor
if(prob(infection_chance))
if(target.reagents)
target.reagents.add_reagent("trioxin", 10)
code/modules/mob/living/carbon/human/species/species_hud.dm
+7 -3
View File
@@ -77,7 +77,11 @@
"mask" = list("loc" = ui_shoes, "name" = "Mask", "slot" = slot_wear_mask, "state" = "mask", "toggle" = 1),
"back" = list("loc" = ui_sstore1, "name" = "Back", "slot" = slot_back, "state" = "back")
)
/datum/hud_data/ipc
/datum/hud_data/ipc
has_hydration = 0
/datum/hud_data/construct
has_hydration = 0
has_nutrition = 0
code/modules/mob/living/carbon/human/species/station/golem.dm
+18
View File
@@ -68,6 +68,14 @@
remains_type = /obj/effect/decal/cleanable/ash
radiation_mod = 0
max_nutrition_factor = -1
max_hydration_factor = -1
hud_type = /datum/hud_data/construct
var/turn_into_materials = TRUE //the golem will turn into materials upon its death
var/golem_designation = "coal" //used in the creation of the name
@@ -739,6 +747,8 @@
inherent_verbs = list(/mob/living/carbon/human/proc/consume_material, /mob/living/carbon/human/proc/breath_of_life)
bodytype = "Human"
breath_pressure = 16
breath_type = "oxygen"
poison_type = "phoron"
@@ -768,6 +778,14 @@
golem_designation = "flesh"
radiation_mod = 1
hud_type = /datum/hud_data
max_nutrition_factor = 1
max_hydration_factor = 1
/datum/species/golem/homunculus/handle_death(var/mob/living/carbon/human/H)
if(turn_into_materials)
set waitfor = 0
code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+4
View File
@@ -88,6 +88,10 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
max_nutrition_factor = -1
max_hydration_factor = -1
var/alien_number = 0
var/caste_name = "creature" // Used to update alien name.
var/weeds_heal_rate = 1 // Health regen on weeds.
code/modules/mob/living/carbon/metroid/items.dm
+3 -1
View File
@@ -289,7 +289,9 @@
var/mob/living/carbon/human/G = new(src.loc)
G.key = ghost.key
addtimer(CALLBACK(G, /mob/living/carbon/human.proc/set_species, golem_type), 0)
G.set_species(golem_type)
G.name = G.species.get_random_name()
G.real_name = G.species.get_random_name()
to_chat(G, "<span class='notice'>You are a golem. Serve [user], and assist them in completing their goals at any cost.</span>")
qdel(src)
code/modules/mob/living/simple_animal/constructs/constructs.dm
+2 -2
View File
@@ -197,8 +197,8 @@
health_prefix = "artificer"
response_harm = "viciously beaten"
harm_intent_damage = 5
melee_damage_lower = 5
melee_damage_upper = 5
melee_damage_lower = 10
melee_damage_upper = 10
attacktext = "rammed"
speed = 0
environment_smash = 1
code/modules/mob/living/simple_animal/simple_animal.dm
+2 -2
View File
@@ -668,8 +668,8 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
/mob/living/simple_animal/can_fall()
if (stat != DEAD && flying)
return FALSE
else
return TRUE
return ..()
/mob/living/simple_animal/can_ztravel()
if (stat != DEAD && flying)
code/modules/mob/mob_helpers.dm
+8 -8
View File
@@ -1190,16 +1190,16 @@ proc/is_blind(A)
var/hydration_mul = hydration/max_hydration
if(hydration_mul >= CREW_HYDRATION_OVERHYDRATED)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
if(hydration_mul <= CREW_HYDRATION_DEHYDRATED)
return minscale + ( (maxscale - minscale) * 0.25)
return minscale
if(hydration_mul <= CREW_HYDRATION_VERYTHIRSTY)
return minscale + ( (maxscale - minscale) * 0.5)
return minscale + ( (maxscale - minscale) * 0.33)
if(hydration_mul <= CREW_HYDRATION_THIRSTY)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
return minscale + ( (maxscale - minscale) * 1)
@@ -1214,16 +1214,16 @@ proc/is_blind(A)
var/nutrition_mul = nutrition/max_nutrition
if(nutrition_mul >= CREW_NUTRITION_OVEREATEN)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
if(nutrition_mul <= CREW_NUTRITION_STARVING)
return minscale + ( (maxscale - minscale) * 0.25)
return minscale
if(nutrition_mul <= CREW_NUTRITION_VERYHUNGRY)
return minscale + ( (maxscale - minscale) * 0.5)
return minscale + ( (maxscale - minscale) * 0.33)
if(nutrition_mul <= CREW_NUTRITION_HUNGRY)
return minscale + ( (maxscale - minscale) * 0.75)
return minscale + ( (maxscale - minscale) * 0.66)
return minscale + ( (maxscale - minscale) * 1)
code/modules/organs/subtypes/parasite.dm
+3 -1
View File
@@ -251,9 +251,11 @@
if(prob(10))
if(!isundead(owner))
if(ishuman_species(owner))
for(var/datum/language/L in owner.languages)
owner.remove_language(L.name)
owner << "<span class='warning'>You feel life leaving your husk, but death rejects you...</span>"
playsound(src.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
owner << "<font size='3'> <span class='cult'>All that is left is a cruel hunger for the flesh of the living, and the desire to spread this infection. You must consume all the living!</font></span>"
owner << "<font size='3'><span class='cult'>All that is left is a cruel hunger for the flesh of the living, and the desire to spread this infection. You must consume all the living!</font></span>"
owner.set_species("Zombie")
else
owner.adjustToxLoss(50)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+6 -5
View File
@@ -164,7 +164,9 @@
description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
reagent_state = LIQUID
color = "#0064C877"
metabolism = REM * 10
metabolism = REM * 2
ingest_met = REM * 10
touch_met = REM * 30
taste_description = "water"
glass_icon_state = "glass_clear"
@@ -234,10 +236,9 @@
if(istype(M) && !istype(M, /mob/abstract))
M.color = initial(M.color)
/datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
if(istype(M, /mob/living/carbon/slime))
var/mob/living/carbon/slime/S = M
S.adjustToxLoss(8 * removed) // Babies have 150 health, adults have 200; So, 10 units and 13.5
/datum/reagent/water/affect_touch(var/mob/living/carbon/slime/S, var/alien, var/removed)
if(istype(S))
S.adjustToxLoss( volume * (removed/REM) * 0.23 )
if(!S.client)
if(S.Target) // Like cats
S.Target = null
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+3 -3
View File
@@ -94,6 +94,7 @@
description = "An abstract type you shouldn't be able to see."
reagent_state = LIQUID
color = "#404030"
ingest_met = REM * 5
var/hydration_factor = 1 //How much hydration to add per unit.
var/nutriment_factor = 0.5 //How much nutrition to add per unit.
@@ -134,7 +135,7 @@
/datum/reagent/alcohol/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.intoxication += (strength / 100) * removed
M.intoxication += (strength / 100) * removed * 3.5
if (druggy != 0)
M.druggy = max(M.druggy, druggy)
@@ -154,7 +155,6 @@
name = "Ethanol"
id = "ethanol"
description = "A well-known alcohol with a variety of applications."
ingest_met = 0.5
flammability_divisor = 10
taste_description = "pure alcohol"
@@ -201,7 +201,7 @@
description = "A fairly harmless alcohol that has intoxicating effects on certain species."
reagent_state = LIQUID
color = "#404030"
ingest_met = 0.17 //Extremely slow metabolic rate means the liver will generally purge it faster than it can intoxicate you
ingest_met = REM * 0.5 //Extremely slow metabolic rate means the liver will generally purge it faster than it can intoxicate you
flammability_divisor = 7 //Butanol is a bit less flammable than ethanol
taste_description = "alcohol"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+3 -1
View File
@@ -57,7 +57,8 @@
description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
taste_mult = 4
reagent_state = SOLID
metabolism = REM * 4
metabolism = REM * 2
ingest_met = REM * 4
var/nutriment_factor = 12 // Per removed in digest.
var/hydration_factor = 0 // Per removed in digest.
var/blood_factor = 6
@@ -689,6 +690,7 @@
id = "drink"
description = "Uh, some kind of drink."
reagent_state = LIQUID
metabolism = REM * 10
color = "#E78108"
var/nutrition = 0 // Per unit
var/hydration = 8 // Per unit
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+12 -4
View File
@@ -311,7 +311,7 @@
description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
reagent_state = LIQUID
color = "#A5F0EE"
touch_met = 50
touch_met = REM * 10
taste_description = "sourness"
/datum/reagent/space_cleaner/touch_obj(var/obj/O)
@@ -324,9 +324,6 @@
S.dirt = 0
T.clean_blood()
for(var/mob/living/carbon/slime/M in T)
M.adjustToxLoss(rand(5, 10))
/datum/reagent/space_cleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
if(M.r_hand)
M.r_hand.clean_blood()
@@ -354,6 +351,17 @@
return
M.clean_blood()
if(istype(M,/mob/living/carbon/slime))
var/mob/living/carbon/slime/S = M
S.adjustToxLoss( volume * (removed/REM) * 0.5 )
if(!S.client)
if(S.Target) // Like cats
S.Target = null
++S.Discipline
if(dose == removed)
S.visible_message("<span class='warning'>[S]'s flesh sizzles where the water touches it!</span>", "<span class='danger'>Your flesh burns in the water!</span>")
/datum/reagent/lube
name = "Space Lube"
id = "lube"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+28 -9
View File
@@ -119,7 +119,7 @@
description = "Cardox is an mildly toxic, expensive, NanoTrasen designed cleaner intended to eliminate liquid phoron stains from suits."
reagent_state = LIQUID
color = "#EEEEEE"
metabolism = 0.6 // 100 seconds for 30 units to metabolise.
metabolism = 0.3 // 100 seconds for 30 units to metabolise.
taste_description = "cherry"
conflicting_reagent = /datum/reagent/toxin/phoron
strength = 1
@@ -268,7 +268,7 @@
reagent_state = SOLID
color = "#CCCCCC"
taste_description = "salty dirt"
metabolism = REM * 10
touch_met = REM * 10
breathe_mul = 0
/datum/reagent/toxin/fertilizer/monoammoniumphosphate/touch_turf(var/turf/simulated/T)
@@ -301,12 +301,13 @@
/datum/reagent/toxin/fertilizer/monoammoniumphosphate/affect_touch(var/mob/living/carbon/slime/S, var/alien, var/removed)
if(istype(S))
S.adjustToxLoss(8 * removed)
if(!S.client && S.Target)
S.Target = null
++S.Discipline
S.adjustToxLoss( volume * (removed/REM) * 0.23 )
if(!S.client)
if(S.Target) // Like cats
S.Target = null
++S.Discipline
if(dose == removed)
S.visible_message("<span class='warning'>[S]'s flesh sizzles where the liquid touches it!</span>", "<span class='danger'>Your flesh burns in the liquid!</span>")
S.visible_message("<span class='warning'>[S]'s flesh sizzles where the foam touches it!</span>", "<span class='danger'>Your flesh burns in the foam!</span>")
/datum/reagent/toxin/plantbgone
name = "Plant-B-Gone"
@@ -792,14 +793,32 @@
taste_description = "old eggs"
metabolism = REM
unaffected_species = IS_DIONA | IS_MACHINE | IS_UNDEAD
affects_dead = TRUE
/datum/reagent/toxin/trioxin/affect_blood(var/mob/living/carbon/M, var/removed)
..()
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(M.reagents.has_reagent("spaceacillin", 15))
if(H.reagents.has_reagent("spaceacillin", 15))
return
if(!H.internal_organs_by_name["zombie"] && prob(15))
var/obj/item/organ/external/affected = H.get_organ("chest")
var/obj/item/organ/parasite/zombie/infest = new()
infest.replaced(H, affected)
infest.replaced(H, affected)
if(ishuman_species(H))
if(!H.internal_organs_by_name["brain"]) //destroying the brain stops trioxin from bringing the dead back to life
return
if(H && H.stat != DEAD)
return
for(var/datum/language/L in H.languages)
H.remove_language(L.name)
H.set_species("Zombie")
H.revive()
playsound(H.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
to_chat(H,"<font size='3'><span class='cult'>You return back to life as the undead, all that is left is the hunger to consume the living and the will to spread the infection.</font></span>")
html/changelog.html
+105
View File
@@ -56,6 +56,111 @@
-->
<div class="commit sansserif">
<h2 class="date">08 October 2018</h2>
<h3 class="author">PoZe updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Deleted wrong pipe below medical break room, it shouldn't shoot trash anymore.</li>
<li class="maptweak">Added one cryostatis bag into medica storage. And added a sink to the chemistry. Added disposal unit to EMT room.</li>
<li class="bugfix">Chemistry windoors access is fixed.</li>
<li class="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.</li>
</ul>
<h2 class="date">07 October 2018</h2>
<h3 class="author">BurgerBB updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixes shutters making everything look ugly.</li>
<li class="bugfix">Fixes disposals and cargo access.</li>
<li class="tweak">Increase the metabolism rate of drinks and alcohol so they metabolize faster. Fixed incorrect metabolism rates for ethanol and butanol.</li>
<li class="tweak">Reverted the default settings to the UI to reflect old settings.</li>
<li class="balance">Alcohol now properly gets people drunk. Adjusted the metabolism rate of ethanol/butanol.</li>
<li class="balance">Damage to slimes is now based on a percentage of the volume of that reagent on the slime, meaning more water kills slimes faster.</li>
<li class="bugfix">Hunger/thirst icons now scale to their hunger/thirst levels appropriately.</li>
<li class="bugfix">Fixed hunger/thirst penalty scaling.</li>
</ul>
<h2 class="date">06 October 2018</h2>
<h3 class="author">Alberyk updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added several material based golems, they can be created via xenobiology or by magic using ten units of any material stack.</li>
<li class="rscadd">Added some species related blood tracks.</li>
<li class="rscadd">Added zombies.</li>
<li class="rscadd">Added new options to the custom loadout; dresses and fannypacks.</li>
<li class="rscadd">Added medical gowns to medbay.</li>
<li class="rscadd">Ported the holodeck locking feature from baystation, heads of staff and the chaplain can lock and unlock the holodeck.</li>
<li class="rscadd">Added new vaurca custom loadout options.</li>
<li class="rscadd">Added a new hairstyle; the long braid 2.</li>
<li class="rscadd">Added magic eight ball and spirit boards.</li>
<li class="tweak">Cult teleporting runes do not work on the central command z-level anymore.</li>
<li class="tweak">You can not write runes on space or open spaces anymore.</li>
<li class="tweak">Accepting a wizard apprentice contract will now create a set of wizard clothing.</li>
</ul>
<h3 class="author">Alberyk, AndurilFlame, Bauser, DronzTheWolf updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added tajaran clothing options to the loadout.</li>
<li class="rscadd">Added a new tajaran hairstyle option.</li>
</ul>
<h3 class="author">Arrow768 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Nanotrasen scientists have discovered possible applications for cortical stacks in science..</li>
<li class="bugfix">The staff of change takes longer to recharge and has a reduced amount of charges.</li>
<li class="tweak">Airlocks now take a bit to weld and unweld..</li>
<li class="rscadd">Nanotrasen has decided to hire "Medical Interns" again.</li>
<li class="tweak">The Leyon Gunsmithing LLC has reworked the "Everyman" to be targeted more towards civilians and was able to reduce the market-price of it.</li>
<li class="rscadd">NT has negotaited a contract for V'krexi cubes with a supplier.</li>
<li class="rscadd">The syndicate has managed to acquire some "state of the art" rifles from Adohmai and made them available to their operatives.</li>
</ul>
<h3 class="author">BurgerBB updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Event infestations can now target anywhere on the station, as long there are no occupents.</li>
<li class="tweak">Removed yithians and diyaabs from infestation events and replaced them with slimes and hivebots.</li>
<li class="rscadd">Adds several new chocolate bars to the getmore chocolate vendor.</li>
<li class="rscadd">Added various menu settings for the general interface to allow more space.</li>
<li class="rscadd">Chefs now spawn with a box of 12 randomly spawned fruit/vegetables.</li>
<li class="rscadd">Added several new random dungeon spawns.</li>
<li class="maptweak">Removed the ODIN departures vending machines.</li>
<li class="maptweak">Remapped the cargo lobby. Remapped disposals/the crusher. Added a mail disposals room. Relocated main level cryo to the main level dorms.</li>
<li class="rscadd">Added hydration mechanics. Hydrate yourself by drinking beverages and water. IPCs do not have hydration mechanics, as they are machines.</li>
<li class="rscadd">Adds salt to various junkfood items. Salt reduces hydration.</li>
<li class="maptweak">Added various sources of lube and water for off-station antags. Increased the amount of watertanks in maintenance.</li>
<li class="rscadd">Added a new chemical, Potassium Hydrophoride, which hydrates the person directly through the bloodstream. These exist in most antag rig chem dispensers an can be made in chemistry.</li>
<li class="rscadd">Injecting yourself with beverages such as coffee or alcohol have their effects increased by 4, with the exception of nutrition and hydration gains. Enjoy IV drips filled with vodka.</li>
<li class="balance">Removed healing mechanics from tea, milk, and soy.</li>
<li class="balance">When thirsty, hungry, overweight, or overhydrated, you have a lower pain tolerance, and move slower. Maximum slow is 33%, and maximum pain increase is 100% at 0 nutrition and 0 hydration.</li>
<li class="balance">Hunger factor from moving reduced by half. Removed nutrition loss from sprinting, however not stamina regeneration.</li>
</ul>
<h3 class="author">Drago updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported Polaris Station evening gown, converted to greyscale.</li>
<li class="rscdel">Adds gown to loadout, color customization added.</li>
</ul>
<h3 class="author">Furrycactus updated:</h3>
<ul class="changes bgimages16">
<li class="maptweak">Drastically increased the size of each Solar Array on the station so that they're actually useful. Enough to serve as backup power on high intensity rounds, or primary power on low intensity. A useful entry point for anyone that wants to learn Engineering.</li>
<li class="maptweak">Following through with the second stage of the Aurora Redesign Project, NanoTrasen has this time put its structural engineers hard at work to redesign the Medical Bay. Again. The architects have this time combined the positive design elements of the previous two layouts, combining them into an efficient and easier to navigate design. Hopefully this assists our doctors in doing their jobs better.</li>
</ul>
<h3 class="author">Lord Fowl updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Baton strikes directed to the head now disorientate instead of just causing 1.5x agony.</li>
<li class="tweak">Most hats now cover the head and provide appropriate protections.</li>
</ul>
<h3 class="author">PoZe updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Shaking table now knocks things off</li>
<li class="rscadd">Big mobs now knock things off table if they walk or climb on it, this includes industrail IPC frames, Dionea, cows, etc. Other species will knock things off if they are not in help intent or if they are running.</li>
<li class="maptweak">As per privacy update all bathrooms on the station no longer have cameras installed in them, with the exception of the brig bathroom for prisoners.</li>
<li class="rscadd">Carps and giant spiders will now attack shields. If there are no other targets present they will target shields. If there are any mobs present they will try to reach them, and if there is a shield in the way they will destroy it.</li>
<li class="tweak">Hostile mobs now have better search systems. They will prioritize any living mobs over other targets.</li>
</ul>
<h3 class="author">PoZe, ben10083 updated:</h3>
<ul class="changes bgimages16">
<li class="maptweak">Nanotrasen has hired a designer to remake the interview room on the Odin.</li>
<li class="maptweak">ERT Cmdr's Spec Ops ready room button now does not include the Admin shuttle, the button for the Admin shuttle is now beside it's door. The Spec Ops button is also renamed.</li>
</ul>
<h3 class="author">dapocalypse updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added a password protection system for files on modular computers.</li>
</ul>
<h2 class="date">01 October 2018</h2>
<h3 class="author">PoZe updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+6262 -6139
View File
File diff suppressed because it is too large Load Diff
html/changelogs/Sindorman-cameras.yml
-12
View File
@@ -1,12 +0,0 @@
author: PoZe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "As per privacy update all bathrooms on the station no longer have cameras installed in them, with the exception of the brig bathroom for prisoners."
html/changelogs/Sindorman-carp-update.yml
-38
View File
@@ -1,38 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: PoZe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Carps and giant spiders will now attack shields. If there are no other targets present they will target shields. If there are any mobs present they will try to reach them, and if there is a shield in the way they will destroy it."
- tweak: "Hostile mobs now have better search systems. They will prioritize any living mobs over other targets."
html/changelogs/Sindorman-centra-remap.yml
-13
View File
@@ -1,13 +0,0 @@
author: PoZe, ben10083
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Nanotrasen has hired a designer to remake the interview room on the Odin."
- maptweak: "ERT Cmdr's Spec Ops ready room button now does not include the Admin shuttle, the button for the Admin shuttle is now beside it's door. The Spec Ops button is also renamed."
html/changelogs/Sindorman-table.yml
-13
View File
@@ -1,13 +0,0 @@
author: PoZe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Shaking table now knocks things off"
- rscadd: "Big mobs now knock things off table if they walk or climb on it, this includes industrail IPC frames, Dionea, cows, etc. Other species will knock things off if they are not in help intent or if they are running."
html/changelogs/albery-runes.yml
-7
View File
@@ -1,7 +0,0 @@
author: Alberyk
delete-after: True
changes:
- tweak: "Cult teleporting runes do not work on the central command z-level anymore."
- tweak: "You can not write runes on space or open spaces anymore."
html/changelogs/alberyk-blood.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added some species related blood tracks."
html/changelogs/alberyk-brains.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added zombies."
html/changelogs/alberyk-clothing.yml
-7
View File
@@ -1,7 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added new options to the custom loadout; dresses and fannypacks."
- rscadd: "Added medical gowns to medbay."
html/changelogs/alberyk-golem.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added several material based golems, they can be created via xenobiology or by magic using ten units of any material stack."
html/changelogs/alberyk-hair.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added a new hairstyle; the long braid 2."
html/changelogs/alberyk-holodeck.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Ported the holodeck locking feature from baystation, heads of staff and the chaplain can lock and unlock the holodeck."
html/changelogs/alberyk-tajara.yml
-7
View File
@@ -1,7 +0,0 @@
author: Alberyk, AndurilFlame, Bauser, DronzTheWolf
delete-after: True
changes:
- rscadd: "Added tajaran clothing options to the loadout."
- rscadd: "Added a new tajaran hairstyle option."
html/changelogs/alberyk-toys.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added magic eight ball and spirit boards."
html/changelogs/alberyk-vaurca.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added new vaurca custom loadout options."
html/changelogs/alberyk-wizard.yml
-6
View File
@@ -1,6 +0,0 @@
author: Alberyk
delete-after: True
changes:
- tweak: "Accepting a wizard apprentice contract will now create a set of wizard clothing."
html/changelogs/arrow768-door-welding.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Airlocks now take a bit to weld and unweld.."
html/changelogs/arrow768-leyon.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "The Leyon Gunsmithing LLC has reworked the \"Everyman\" to be targeted more towards civilians and was able to reduce the market-price of it."
html/changelogs/arrow768-medical-intern.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Nanotrasen has decided to hire \"Medical Interns\" again."
html/changelogs/arrow768-staff-of-changes.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "The staff of change takes longer to recharge and has a reduced amount of charges."
html/changelogs/arrow769-cortical-stacks-tech.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Nanotrasen scientists have discovered possible applications for cortical stacks in science.."
html/changelogs/arrow769-icelance.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "The syndicate has managed to acquire some \"state of the art\" rifles from Adohmai and made them available to their operatives."
html/changelogs/arrow769-vkrexi.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "NT has negotaited a contract for V'krexi cubes with a supplier."
html/changelogs/burgerbb - additional dungeons.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added several new random dungeon spawns."
html/changelogs/burgerbb - lunchbox removal.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Removed the ODIN departures vending machines."
html/changelogs/burgerbb - spawn produce.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Chefs now spawn with a box of 12 randomly spawned fruit/vegetables."
html/changelogs/burgerbb-chocolate.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds several new chocolate bars to the getmore chocolate vendor."
html/changelogs/burgerbb-disposals_improvements.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Remapped the cargo lobby. Remapped disposals/the crusher. Added a mail disposals room. Relocated main level cryo to the main level dorms."
html/changelogs/burgerbb-drink_and_hunger_overhaul.yml
-45
View File
@@ -1,45 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added hydration mechanics. Hydrate yourself by drinking beverages and water. IPCs do not have hydration mechanics, as they are machines."
- rscadd: "Adds salt to various junkfood items. Salt reduces hydration."
- maptweak: "Added various sources of lube and water for off-station antags. Increased the amount of watertanks in maintenance."
- rscadd: "Added a new chemical, Potassium Hydrophoride, which hydrates the person directly through the bloodstream. These exist in most antag rig chem dispensers an can be made in chemistry."
- rscadd: "Injecting yourself with beverages such as coffee or alcohol have their effects increased by 4, with the exception of nutrition and hydration gains. Enjoy IV drips filled with vodka."
- balance: "Removed healing mechanics from tea, milk, and soy."
- balance: "When thirsty, hungry, overweight, or overhydrated, you have a lower pain tolerance, and move slower. Maximum slow is 33%, and maximum pain increase is 100% at 0 nutrition and 0 hydration."
- balance: "Hunger factor from moving reduced by half. Removed nutrition loss from sprinting, however not stamina regeneration."
html/changelogs/burgerbb-infestation_overhaul.yml
-39
View File
@@ -1,39 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Event infestations can now target anywhere on the station, as long there are no occupents."
- tweak: "Removed yithians and diyaabs from infestation events and replaced them with slimes and hivebots."
html/changelogs/burgerbb-skinhead.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: BurgerBB
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added various menu settings for the general interface to allow more space."
html/changelogs/dapocalypse-development.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: dapocalypse
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added a password protection system for files on modular computers."
html/changelogs/dragodress.yml
-38
View File
@@ -1,38 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Drago
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Ported Polaris Station evening gown, converted to greyscale."
- rscdel: "Adds gown to loadout, color customization added."
html/changelogs/fowl-gudgot.yml
-7
View File
@@ -1,7 +0,0 @@
author: Lord Fowl
delete-after: True
changes:
- tweak: "Baton strikes directed to the head now disorientate instead of just causing 1.5x agony."
- tweak: "Most hats now cover the head and provide appropriate protections."
html/changelogs/furrycactus-medical-overhaul.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Furrycactus
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Following through with the second stage of the Aurora Redesign Project, NanoTrasen has this time put its structural engineers hard at work to redesign the Medical Bay. Again. The architects have this time combined the positive design elements of the previous two layouts, combining them into an efficient and easier to navigate design. Hopefully this assists our doctors in doing their jobs better."
html/changelogs/furrycactus-solars.yml
-37
View File
@@ -1,37 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Furrycactus
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Drastically increased the size of each Solar Array on the station so that they're actually useful. Enough to serve as backup power on high intensity rounds, or primary power on low intensity. A useful entry point for anyone that wants to learn Engineering."
icons/mob/human_races/r_human.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

interface/skin.dmf
+3 -14
View File
@@ -821,6 +821,7 @@ menu "menu"
name = "&Stretch to fit"
command = ".winset \"mapwindow.map.icon-size=0\""
category = "&Icons"
is-checked = true
can-check = true
group = "size"
saved-params = "is-checked"
@@ -842,7 +843,6 @@ menu "menu"
name = "&64x64"
command = ".winset \"mapwindow.map.icon-size=64\""
category = "&Icons"
is-checked = true
can-check = true
group = "size"
saved-params = "is-checked"
@@ -908,6 +908,7 @@ menu "menu"
name = "Enable &vertical splitter"
command = ".winset \"mainwindow.mainvsplit.show-splitter true\" "
category = "&Resizing"
is-checked = true
can-check = true
group = "splitter_vertical"
saved-params = "is-checked"
@@ -915,7 +916,6 @@ menu "menu"
name = "Disable &vertical splitter"
command = ".winset \"mainwindow.mainvsplit.show-splitter false\" "
category = "&Resizing"
is-checked = true
can-check = true
group = "splitter_vertical"
saved-params = "is-checked"
@@ -923,6 +923,7 @@ menu "menu"
name = "Enable &horizontal splitter"
command = ".winset \"rpane.rpanewindow.show-splitter true;\" "
category = "&Resizing"
is-checked = true
can-check = true
group = "splitter_horizontal"
saved-params = "is-checked"
@@ -930,7 +931,6 @@ menu "menu"
name = "Disable &horizontal splitter"
command = ".winset \"rpane.rpanewindow.show-splitter false;\" "
category = "&Resizing"
is-checked = true
can-check = true
group = "splitter_horizontal"
saved-params = "is-checked"
@@ -1051,7 +1051,6 @@ window "mainwindow"
saved-params = "splitter"
right = "rpane"
is-vert = true
show-splitter = false
elem "input"
type = INPUT
pos = 0,462
@@ -1101,8 +1100,6 @@ window "mapwindow"
font-size = 7
is-default = true
saved-params = "icon-size"
icon-size = 64
zoom = 2
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
on-hide = ".winset\"mainwindow.mainvsplit.left=\""
@@ -1166,7 +1163,6 @@ window "rpane"
saved-params = "splitter"
right = "outputwindow"
is-vert = false
show-splitter = false
elem "rulesb"
type = BUTTON
pos = 278,0
@@ -1290,7 +1286,6 @@ window "browserwindow"
size = 640x480
anchor1 = none
anchor2 = none
background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
title = "Browser"
titlebar = false
@@ -1318,7 +1313,6 @@ window "infowindow"
size = 640x480
anchor1 = none
anchor2 = none
background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
title = "Info"
titlebar = false
@@ -1337,7 +1331,6 @@ window "infowindow"
right-click = true
saved-params = ""
highlight-color = #00aa00
tab-background-color = none
on-show = ".winset\"rpane.infob.is-visible=true;rpane.browseb.is-visible=true?rpane.infob.pos=130,0:rpane.infob.pos=65,0 rpane.textb.is-visible=true rpane.infob.is-checked=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=infowindow\""
on-hide = ".winset\"rpane.infob.is-visible=false;rpane.browseb.is-visible=true?rpane.browseb.is-checked=true rpane.rpanewindow.left=browserwindow:rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=\""
@@ -1348,7 +1341,6 @@ window "text_editor"
size = 360x488
anchor1 = none
anchor2 = none
background-color = none
is-visible = false
border = sunken
saved-params = "pos;size;is-minimized;is-maximized"
@@ -1361,7 +1353,6 @@ window "text_editor"
size = 104x24
anchor1 = none
anchor2 = none
background-color = none
saved-params = "is-checked"
text = "Exit without saving"
command = ""
@@ -1371,7 +1362,6 @@ window "text_editor"
size = 104x24
anchor1 = none
anchor2 = none
background-color = none
saved-params = "is-checked"
text = "Save"
command = ""
@@ -1381,7 +1371,6 @@ window "text_editor"
size = 104x24
anchor1 = none
anchor2 = none
background-color = none
saved-params = "is-checked"
text = "Save + Exit"
command = ""
maps/aurora/aurora-1_centcomm.dmm
+1 -1
View File
@@ -22653,7 +22653,7 @@
name = "Administration Shuttle";
pixel_x = 0;
pixel_y = 26;
req_access = list(101)
req_access = list(108)
},
/turf/unsimulated/floor{
icon_state = "dark"
maps/aurora/aurora-3_sublevel.dmm
+41 -955
View File
File diff suppressed because it is too large Load Diff
maps/aurora/aurora-4_mainlevel.dmm
+245 -207
View File
@@ -5779,6 +5779,43 @@
/obj/item/weapon/reagent_containers/spray/cleaner,
/turf/simulated/floor/carpet,
/area/chapel/office)
"alG" = (
/obj/machinery/door/airlock/glass_mining{
name = "Cargo Bay";
req_access = null;
req_one_access = list(31,48)
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"alH" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/glass_mining{
name = "Break Room";
req_access = null;
req_one_access = list(31,48)
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"alI" = (
/obj/machinery/door/airlock/security{
name = "Evidence Storage";
@@ -5982,6 +6019,20 @@
/obj/machinery/shield_gen,
/turf/simulated/floor/plating,
/area/engineering/storage)
"amf" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_mining{
name = "Break Room";
req_access = null;
req_one_access = list(31,48)
},
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"amg" = (
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
@@ -6171,6 +6222,89 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall/r_wall,
/area/maintenance/security_starboard)
"amz" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/airlock/glass_mining{
name = "Mining";
req_access = null;
req_one_access = list(31,48)
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/outpost/mining_main/refinery)
"amA" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
name = "Cargo Maintenance";
req_access = list(31,48)
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"amB" = (
/obj/machinery/door/airlock/hatch{
name = "Disposals Maintenance";
req_one_access = list(12,50)
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"amC" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/machinery/newscaster{
pixel_x = 0;
pixel_y = -32
},
/obj/machinery/camera/network/supply{
c_tag = "Cargo - Break Room";
dir = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"amD" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/table/standard,
/obj/item/device/destTagger,
/obj/effect/floor_decal/corner/brown{
dir = 10
},
/obj/machinery/light,
/obj/structure/noticeboard{
pixel_y = -32
},
/obj/machinery/camera/network/supply{
c_tag = "Cargo - Mail Room";
dir = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/mail_room)
"amE" = (
/obj/machinery/camera/network/civilian_main{
c_tag = "Aft Corridor - Camera 3";
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"amF" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled,
@@ -6500,6 +6634,69 @@
/obj/item/weapon/gun/energy/gun,
/turf/simulated/floor/tiled/dark,
/area/security/armoury)
"anv" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
},
/obj/machinery/camera/network/civilian_main{
c_tag = "Aft Corridor - Camera 1";
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"anw" = (
/obj/machinery/camera/network/civilian_main{
c_tag = "Aft Corridor - Camera 2";
dir = 8
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"anx" = (
/obj/structure/table/standard,
/obj/structure/noticeboard{
pixel_x = -32
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"any" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
icon_state = "map_scrubber_on";
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"anz" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/network/supply{
c_tag = "Cargo - Disposals, Upper";
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/maintenance/disposal)
"anA" = (
/obj/machinery/door/airlock/glass_mining{
name = "Warehouse";
req_access = list(31)
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"anC" = (
/obj/structure/window/reinforced{
dir = 4
@@ -30776,7 +30973,8 @@
},
/obj/machinery/door/window/brigdoor/northright{
dir = 8;
name = "Chemistry Desk"
name = "Chemistry Desk";
req_access = list(33)
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
@@ -39019,7 +39217,8 @@
pixel_y = 23
},
/obj/structure/disposalpipe/segment{
dir = 4
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
@@ -39027,9 +39226,6 @@
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"bvX" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -39037,6 +39233,10 @@
pixel_x = 7;
pixel_y = 28
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"bvY" = (
@@ -39895,6 +40095,9 @@
/area/hallway/primary/central_one)
"bxq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/junction{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"bxr" = (
@@ -46545,18 +46748,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/chapel/office)
"bNk" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
},
/obj/machinery/camera/network/civilian_main{
c_tag = "Aft Corridor - Camera 3";
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"bNl" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
@@ -50568,25 +50759,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"cah" = (
/obj/machinery/door/airlock/glass_mining{
name = "Cargo Bay";
req_access = list(31)
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"cak" = (
/obj/effect/floor_decal/spline/fancy/wood{
icon_state = "spline_fancy";
@@ -50718,25 +50890,6 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"cav" = (
/obj/machinery/door/airlock/glass_mining{
name = "Equipment Storage";
req_access = list(31)
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"caw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -50941,22 +51094,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"cbc" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/glass_mining{
name = "Break Room";
req_access = list(31)
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"cbd" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -51076,17 +51213,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"cbu" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
name = "Cargo Maintenance";
req_access = list(31)
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"cbv" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/structure/disposalpipe/segment{
@@ -51647,14 +51773,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"cdp" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/machinery/newscaster{
pixel_x = 0;
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"cdq" = (
/obj/machinery/vending/cigarette,
/obj/effect/floor_decal/corner/red/diagonal,
@@ -51754,26 +51872,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"cdB" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/airlock/glass_mining{
name = "Break Room";
req_access = list(31)
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/quartermaster/break_room)
"cdC" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/dark,
/area/maintenance/disposal)
"cdG" = (
/obj/random/junk,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -51969,22 +52067,6 @@
"cdQ" = (
/turf/simulated/wall,
/area/outpost/mining_main/refinery)
"cdR" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/airlock/glass_mining{
name = "Break Room";
req_access = list(31)
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/outpost/mining_main/refinery)
"cdS" = (
/obj/effect/floor_decal/corner/brown{
icon_state = "corner_white";
@@ -55558,16 +55640,6 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/hydroponics)
"cqk" = (
/obj/machinery/camera/network/civilian_main{
c_tag = "Aft Corridor - Camera 1";
dir = 4
},
/obj/machinery/newscaster{
pixel_x = -32
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"cql" = (
/obj/machinery/firealarm/north,
/obj/structure/table/standard,
@@ -55678,13 +55750,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"cqw" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
icon_state = "map_scrubber_on";
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"cqz" = (
/obj/structure/window/reinforced{
icon_state = "rwindow";
@@ -55711,13 +55776,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"cqI" = (
/obj/structure/table/standard,
/obj/structure/noticeboard{
pixel_x = -32
},
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"cqL" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/alarm{
@@ -58232,6 +58290,10 @@
/area/quartermaster/lobby)
"dvg" = (
/obj/machinery/hologram/holopad,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"dzP" = (
@@ -60839,7 +60901,8 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor/northright{
name = "Chemistry Desk"
name = "Chemistry Desk";
req_access = list(33)
},
/obj/machinery/ringer_button{
id = "chemistry_ringer";
@@ -61287,15 +61350,14 @@
/turf/simulated/floor/plating,
/area/maintenance/library)
"nEE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/sign/nosmoking_1{
pixel_y = 32
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"nGb" = (
@@ -61625,21 +61687,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay)
"oDu" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/table/standard,
/obj/item/device/destTagger,
/obj/effect/floor_decal/corner/brown{
dir = 10
},
/obj/machinery/light,
/obj/structure/noticeboard{
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/quartermaster/mail_room)
"oEo" = (
/obj/structure/window/reinforced{
icon_state = "rwindow";
@@ -61706,6 +61753,7 @@
pixel_x = 24;
req_one_access = list(24,11,55)
},
/obj/item/bodybag/cryobag,
/turf/simulated/floor/tiled/white,
/area/medical/main_storage)
"oSF" = (
@@ -62915,23 +62963,6 @@
/obj/random/loot,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"vZi" = (
/obj/machinery/door/airlock/hatch{
name = "Disposals Maintenance";
req_one_access = list(11,50)
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"wbn" = (
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -63033,6 +63064,13 @@
/obj/effect/large_stock_marker,
/turf/simulated/floor/tiled,
/area/quartermaster/lobby)
"wJR" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/medical/emt)
"wKI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -63400,13 +63438,14 @@
icon_state = "corner_white";
dir = 5
},
/obj/structure/sign/nosmoking_1{
pixel_y = 32
},
/obj/machinery/light{
icon_state = "tube1";
dir = 1
},
/obj/structure/sink/kitchen{
name = "chemistry sink";
pixel_y = 28
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"ygM" = (
@@ -64544,7 +64583,6 @@
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
@@ -90488,10 +90526,10 @@ bYW
bZp
bWm
bWm
cav
anA
bWm
bWm
cbu
amA
pjW
ykj
ccH
@@ -91003,7 +91041,7 @@ mEE
bZD
cip
cax
cbc
alH
ciB
cbw
cbO
@@ -91011,9 +91049,9 @@ cco
ccJ
cde
cdo
cdB
amf
cdK
cdR
amz
cdX
cef
ceu
@@ -91267,7 +91305,7 @@ cbx
cbx
cbx
cbx
cdp
amC
pjW
cdL
cdQ
@@ -92029,7 +92067,7 @@ bXQ
cia
bWm
bZG
cah
alG
bZG
pjW
ciF
@@ -93066,7 +93104,7 @@ cbU
cct
cct
cct
oDu
amD
xIJ
cdO
cdQ
@@ -93286,7 +93324,7 @@ bKm
bLf
bLS
bME
bNk
anv
bNM
bOv
bLU
@@ -93304,17 +93342,17 @@ bLU
bLU
bLU
bLU
cqk
bLU
bME
amE
bRh
bXw
bXV
bYt
bYN
bLf
cqw
any
cqz
cqI
anx
cqN
oqb
xIJ
@@ -93809,7 +93847,7 @@ bLU
bLU
bLU
bLU
bLU
anw
bSV
gsL
bLf
@@ -94866,7 +94904,7 @@ ccz
ccV
cdh
mEF
cdC
anz
cwf
vFt
bSx
@@ -95373,7 +95411,7 @@ bUz
bUz
bUz
caW
vZi
amB
nYV
ags
coD
@@ -96610,7 +96648,7 @@ bsx
bbr
bxs
bvV
bvW
wJR
bxs
bzE
bAG