mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
upstream-merge-16484 [MDB IGNORE] (#9289)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Selis
GitHub
@@ -19,7 +19,7 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
|
||||
age = _age
|
||||
if(random_icon_states && length(src.random_icon_states) > 0)
|
||||
src.icon_state = pick(src.random_icon_states)
|
||||
if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit
|
||||
if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload))
|
||||
SSpersistence.track_value(src, /datum/persistent/filth)
|
||||
jan_icon = new/obj/effect/decal/jan_hud(src.loc)
|
||||
. = ..()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//TODO: Flash range does nothing currently
|
||||
|
||||
/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, z_transfer = UP|DOWN, shaped)
|
||||
var/multi_z_scalar = CONFIG_GET(number/multi_z_explosion_scalar) // CHOMPEdit
|
||||
var/multi_z_scalar = CONFIG_GET(number/multi_z_explosion_scalar)
|
||||
spawn(0)
|
||||
var/start = world.timeofday
|
||||
epicenter = get_turf(epicenter)
|
||||
@@ -74,7 +74,7 @@
|
||||
var/x0 = epicenter.x
|
||||
var/y0 = epicenter.y
|
||||
var/z0 = epicenter.z
|
||||
if(CONFIG_GET(flag/use_recursive_explosions)) // CHOMPEdit
|
||||
if(CONFIG_GET(flag/use_recursive_explosions))
|
||||
var/power = devastation_range * 2 + heavy_impact_range + light_impact_range //The ranges add up, ie light 14 includes both heavy 7 and devestation 3. So this calculation means devestation counts for 4, heavy for 2 and light for 1 power, giving us a cap of 27 power.
|
||||
explosion_rec(epicenter, power, shaped)
|
||||
else
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
/obj/item/toy/nanotrasenballoon,
|
||||
/obj/item/toy/syndicateballoon,
|
||||
/obj/item/aiModule/syndicate,
|
||||
/obj/item/book/manual/wiki/engineering_hacking, // CHOMPEdit
|
||||
/obj/item/book/manual/wiki/engineering_hacking,
|
||||
/obj/item/card/emag,
|
||||
/obj/item/card/emag_broken,
|
||||
/obj/item/card/id/syndicate,
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
to_chat(user, "You finish drawing.")
|
||||
|
||||
var/msg = "[user.client.key] ([user]) has drawn [drawtype] (with [src]) at [target.x],[target.y],[target.z]."
|
||||
if(CONFIG_GET(flag/log_graffiti)) // CHOMPEdit
|
||||
if(CONFIG_GET(flag/log_graffiti))
|
||||
message_admins(msg)
|
||||
log_game(msg) //We will log it anyways.
|
||||
|
||||
|
||||
@@ -290,7 +290,7 @@
|
||||
if(confirm != "Yes")
|
||||
return
|
||||
|
||||
if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) // CHOMPEdit
|
||||
if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1)
|
||||
to_chat(src, span_danger("You have used the antagHUD and cannot respawn or use communicators!"))
|
||||
return
|
||||
|
||||
|
||||
@@ -299,10 +299,10 @@
|
||||
H.updatehealth()
|
||||
|
||||
if(H.isSynthetic())
|
||||
if(H.health + H.getOxyLoss() + H.getToxLoss() <= CONFIG_GET(number/health_threshold_dead)) // CHOMPEdit
|
||||
if(H.health + H.getOxyLoss() + H.getToxLoss() <= CONFIG_GET(number/health_threshold_dead))
|
||||
return "buzzes, \"Resuscitation failed - Severe damage detected. Begin manual repair before further attempts futile.\""
|
||||
|
||||
else if(H.health + H.getOxyLoss() <= CONFIG_GET(number/health_threshold_dead) || (HUSK in H.mutations) || !H.can_defib) // CHOMPEdit
|
||||
else if(H.health + H.getOxyLoss() <= CONFIG_GET(number/health_threshold_dead) || (HUSK in H.mutations) || !H.can_defib)
|
||||
return "buzzes, \"Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile.\""
|
||||
|
||||
var/bad_vital_organ = check_vital_organs(H)
|
||||
@@ -435,7 +435,7 @@
|
||||
H.apply_damage(burn_damage_amt, BURN, BP_TORSO)
|
||||
|
||||
//set oxyloss so that the patient is just barely in crit, if possible
|
||||
var/barely_in_crit = CONFIG_GET(number/health_threshold_crit) - 1 // CHOMPEdit
|
||||
var/barely_in_crit = CONFIG_GET(number/health_threshold_crit) - 1
|
||||
var/adjust_health = barely_in_crit - H.health //need to increase health by this much
|
||||
H.adjustOxyLoss(-adjust_health)
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
age = _age
|
||||
|
||||
/obj/item/trash/Initialize(mapload)
|
||||
if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) // CHOMPEdit
|
||||
if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload))
|
||||
SSpersistence.track_value(src, /datum/persistent/filth/trash)
|
||||
. = ..()
|
||||
|
||||
|
||||
@@ -5,30 +5,6 @@
|
||||
due_date = 0 // Game time in 1/10th seconds
|
||||
unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
|
||||
|
||||
/* CHOMPEdit Start
|
||||
/obj/item/book/manual/engineering_construction
|
||||
name = "Station Repairs and Construction"
|
||||
icon_state ="bookEngineering"
|
||||
item_state = "book3"
|
||||
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
|
||||
title = "Station Repairs and Construction"
|
||||
|
||||
/obj/item/book/manual/engineering_construction/New()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
<html><head>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<iframe width='100%' height='97%' src="[CONFIG_GET(string/wikiurl)]Guide_to_Construction&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
"}
|
||||
*/ // CHOMPEdit End
|
||||
|
||||
/obj/item/book/manual/engineering_particle_accelerator
|
||||
name = "Particle Accelerator User's Guide"
|
||||
icon_state ="bookParticleAccelerator"
|
||||
@@ -320,30 +296,6 @@
|
||||
</body>
|
||||
</html>"} // CHOMPedit END : Updating the R-UST manual
|
||||
|
||||
/* CHOMPEdit Start
|
||||
/obj/item/book/manual/engineering_hacking
|
||||
name = "Hacking"
|
||||
icon_state ="bookHacking"
|
||||
item_state = "book2"
|
||||
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
|
||||
title = "Hacking"
|
||||
|
||||
/obj/item/book/manual/engineering_hacking/New()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
<html><head>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<iframe width='100%' height='97%' src="[CONFIG_GET(string/wikiurl)]Hacking&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
"}
|
||||
*/ // CHOMPEdit End
|
||||
|
||||
/obj/item/book/manual/engineering_singularity_safety
|
||||
name = "Singularity Safety in Special Circumstances"
|
||||
icon_state ="bookEngineeringSingularitySafety"
|
||||
@@ -677,26 +629,6 @@
|
||||
</html>
|
||||
"}
|
||||
|
||||
/* CHOMPEdit Start
|
||||
/obj/item/book/manual/robotics_manual
|
||||
name = "Guide to Robotics"
|
||||
icon_state ="evabook"
|
||||
item_state = "book3"
|
||||
author = "Simple Robotics" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
|
||||
title = "Guide to Robotics"
|
||||
|
||||
/obj/item/book/manual/robotics_manual/New()
|
||||
..()
|
||||
dat = {"
|
||||
<html><head>
|
||||
</head>
|
||||
<body>
|
||||
<iframe width='100%' height='97%' src="[CONFIG_GET(string/wikiurl)]Guide_to_Robotics&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
|
||||
</body>
|
||||
</html>
|
||||
"}
|
||||
*/ // CHOMPEdit End
|
||||
|
||||
/obj/item/book/manual/robotics_cyborgs
|
||||
name = JOB_CYBORG + "s for Dummies"
|
||||
icon_state = "borgbook"
|
||||
@@ -902,104 +834,6 @@
|
||||
</html>
|
||||
"}
|
||||
|
||||
|
||||
/* CHOMPEdit Start
|
||||
/obj/item/book/manual/security_space_law
|
||||
name = "Corporate Regulations"
|
||||
desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations."
|
||||
icon_state = "bookSpaceLaw"
|
||||
item_state = "book13"
|
||||
author = "The Company"
|
||||
title = "Corporate Regulations"
|
||||
|
||||
/obj/item/book/manual/security_space_law/New()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
<html><head>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<iframe width='100%' height='97%' src="[CONFIG_GET(string/wikiurl)]Corporate_Regulations&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
"}
|
||||
|
||||
|
||||
|
||||
/obj/item/book/manual/medical_diagnostics_manual
|
||||
name = "Medical Diagnostics Manual"
|
||||
desc = "First, do no harm. A detailed medical practitioner's guide."
|
||||
icon_state = "bookMedical"
|
||||
item_state = "book12"
|
||||
author = "Medical Department"
|
||||
title = "Medical Diagnostics Manual"
|
||||
|
||||
/obj/item/book/manual/medical_diagnostics_manual/New()
|
||||
..()
|
||||
dat = {"<html>
|
||||
<head>
|
||||
<style>
|
||||
h1 {font-size: 18px; margin: 15px 0px 5px;}
|
||||
h2 {font-size: 15px; margin: 15px 0px 5px;}
|
||||
li {margin: 2px 0px 2px 15px;}
|
||||
ul {margin: 5px; padding: 0px;}
|
||||
ol {margin: 5px; padding: 0px 15px;}
|
||||
body {font-size: 13px; font-family: Verdana;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<br>
|
||||
<h1>The Oath</h1>
|
||||
|
||||
<i>The Medical Oath sworn by recognised medical practitioners in the employ of [using_map.company_name]</i><br>
|
||||
|
||||
<ol>
|
||||
<li>Now, as a new doctor, I solemnly promise that I will, to the best of my ability, serve humanity-caring for the sick, promoting good health, and alleviating pain and suffering.</li>
|
||||
<li>I recognise that the practice of medicine is a privilege with which comes considerable responsibility and I will not abuse my position.</li>
|
||||
<li>I will practise medicine with integrity, humility, honesty, and compassion-working with my fellow doctors and other colleagues to meet the needs of my patients.</li>
|
||||
<li>I shall never intentionally do or administer anything to the overall harm of my patients.</li>
|
||||
<li>I will not permit considerations of gender, race, religion, political affiliation, sexual orientation, nationality, or social standing to influence my duty of care.</li>
|
||||
<li>I will oppose policies in breach of human rights and will not participate in them. I will strive to change laws that are contrary to my profession's ethics and will work towards a fairer distribution of health resources.</li>
|
||||
<li>I will assist my patients to make informed decisions that coincide with their own values and beliefs and will uphold patient confidentiality.</li>
|
||||
<li>I will recognise the limits of my knowledge and seek to maintain and increase my understanding and skills throughout my professional life. I will acknowledge and try to remedy my own mistakes and honestly assess and respond to those of others.</li>
|
||||
<li>I will seek to promote the advancement of medical knowledge through teaching and research.</li>
|
||||
<li>I make this declaration solemnly, freely, and upon my honour.</li>
|
||||
</ol><br>
|
||||
|
||||
<HR COLOR="steelblue" WIDTH="60%" ALIGN="LEFT">
|
||||
|
||||
<iframe width='100%' height='100%' src="[CONFIG_GET(string/wikiurl)]Guide_to_Medicine&printable=yes&removelinks=1" frameborder="0" id="main_frame"></iframe>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
"}
|
||||
|
||||
|
||||
/obj/item/book/manual/engineering_guide
|
||||
name = "Engineering Textbook"
|
||||
icon_state ="bookEngineering2"
|
||||
item_state = "book3"
|
||||
author = "Engineering Encyclopedia"
|
||||
title = "Engineering Textbook"
|
||||
|
||||
/obj/item/book/manual/engineering_guide/New()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
<html><head>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<iframe width='100%' height='100%' src="[CONFIG_GET(string/wikiurl)]Guide_to_Engineering&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe> </body>
|
||||
|
||||
</html>
|
||||
|
||||
"}
|
||||
*/ // CHOMPEdit End
|
||||
|
||||
/obj/item/book/manual/chef_recipes
|
||||
name = JOB_CHEF + " Recipes"
|
||||
icon_state = "cooked_book"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
author = "NanoTrasen"
|
||||
title = "Standard Operating Procedure"
|
||||
|
||||
/obj/item/book/manual/standard_operating_procedure/Initialize() // CHOMPEdit
|
||||
/obj/item/book/manual/standard_operating_procedure/Initialize()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
author = "Jeremiah Acacius"
|
||||
title = "Corporate Regulations"
|
||||
|
||||
/obj/item/book/manual/command_guide/Initialize() // CHOMPEdit
|
||||
/obj/item/book/manual/command_guide/Initialize()
|
||||
..()
|
||||
dat = {"
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
var/wiki_url = CONFIG_GET(string/wikiurl)
|
||||
if(!wiki_url)
|
||||
//user.balloon_alert(user, "this book is empty!")
|
||||
to_chat(user, "this book is empty!")
|
||||
to_chat(user, span_info("this book is empty!"))
|
||||
return
|
||||
|
||||
//credit_book_to_reader(user)
|
||||
@@ -91,7 +91,7 @@
|
||||
var/wiki_url = CONFIG_GET(string/wikiurl)
|
||||
if(!wiki_url)
|
||||
//user.balloon_alert(user, "this book is empty!")
|
||||
to_chat(user, "this book is empty!")
|
||||
to_chat(user, span_info("this book is empty!"))
|
||||
return
|
||||
|
||||
var/dat = {"<html>
|
||||
@@ -122,7 +122,7 @@
|
||||
return
|
||||
if(usr.stat || usr.restrained())
|
||||
return
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
|
||||
return
|
||||
|
||||
src.set_dir(turn(src.dir, 270))
|
||||
@@ -141,7 +141,7 @@
|
||||
return
|
||||
if(usr.stat || usr.restrained())
|
||||
return
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
|
||||
return
|
||||
|
||||
src.set_dir(turn(src.dir, 90))
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
return
|
||||
if(usr.stat || usr.restrained())
|
||||
return
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
|
||||
return
|
||||
|
||||
src.set_dir(turn(src.dir, 270))
|
||||
@@ -89,7 +89,7 @@
|
||||
return
|
||||
if(usr.stat || usr.restrained())
|
||||
return
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
|
||||
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
|
||||
return
|
||||
|
||||
src.set_dir(turn(src.dir, 90))
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/structure/trash_pile/attack_ghost(mob/observer/user as mob)
|
||||
if(CONFIG_GET(flag/disable_player_mice)) // CHOMPEdit
|
||||
if(CONFIG_GET(flag/disable_player_mice))
|
||||
to_chat(user, span_warning("Spawning as a mouse is currently disabled."))
|
||||
return
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
host = new /mob/living/simple_mob/animal/passive/mouse(get_turf(src))
|
||||
|
||||
if(host)
|
||||
if(CONFIG_GET(flag/uneducated_mice)) // CHOMPEdit
|
||||
if(CONFIG_GET(flag/uneducated_mice))
|
||||
host.universal_understand = 0
|
||||
announce_ghost_joinleave(src, 0, "They are now a mouse.")
|
||||
host.ckey = user.ckey
|
||||
|
||||
Reference in New Issue
Block a user