cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Addiction rework (#3445)

Browse Source 
* Addiction rework

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 14:26:44 +00:00
committed by GitHub
co-authored by Qustinnus Gandalf2k15
parent 43febe3145
commit 3b85cf1430
45 changed files with 607 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+1 -1
View File
@@ -41,7 +41,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
. = ..()
GLOB.start_landmarks_list += src
if(jobspawn_override)
LAZYADDASSOC(GLOB.jobspawn_overrides, name, src)
LAZYADDASSOCLIST(GLOB.jobspawn_overrides, name, src)
if(name != "start")
tag = "start*[name]"
code/game/objects/items/devices/scanners.dm
+5 -6
View File
@@ -452,13 +452,12 @@ GENE SCANNER
else
render_list += "<span class='notice ml-1'>Subject contains no reagents in their stomach.</span>\n"
if(LAZYLEN(M.reagents.addiction_list))
render_list += "<span class='boldannounce ml-1'>Subject is addicted to the following reagents:</span>\n"
for(var/a in M.reagents.addiction_list)
var/datum/reagent/addiction = a
render_list += "<span class='alert ml-2'>[addiction.name]</span>\n"
if(LAZYLEN(M.mind.active_addictions))
render_list += "<span class='boldannounce ml-1'>Subject is addicted to the following types of drug:</span>\n"
for(var/datum/addiction/addiction_type as anything in M.mind.active_addictions)
render_list += "<span class='alert ml-2'>[initial(addiction_type.name)]</span>\n"
else
render_list += "<span class='notice ml-1'>Subject is not addicted to any reagents.</span>\n"
render_list += "<span class='notice ml-1'>Subject is not addicted to any types of drug.</span>\n"
to_chat(user, jointext(render_list, ""), trailing_newline = FALSE) // we handled the last <br> so we don't need handholding