cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
-6
View File
@@ -120,30 +120,25 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return
else
to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
return
if (disabled)
return
if (!linked_console)
to_chat(user, "<span class='warning'>The [name] must be linked to an R&D console first!</span>")
return 1
if (O.is_open_container())
return
if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
return
if (stat)
return
if (busy)
to_chat(user, "<span class='warning'>The [name] is busy. Please wait for completion of previous operation.</span>")
return
var/obj/item/stack/sheet/stack = O
if ((TotalMaterials() + stack.perunit) > max_material_amount)
to_chat(user, "<span class='warning'>The [name] is full. Please remove glass from the protolathe in order to insert more.</span>")
return
var/amount = round(input("How many sheets do you want to add?") as num)
@@ -155,7 +150,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
to_chat(user, "<span class='notice'>You add [amount] sheets to the [src.name].</span>")
if(istype(stack, /obj/item/stack/sheet/glass))
g_amount += amount * MINERAL_MATERIAL_AMOUNT
else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
code/modules/research/destructive_analyzer.dm
-6
View File
@@ -64,31 +64,25 @@ Note: Must be placed within 3 tiles of the R&D Console
return
if (!linked_console)
to_chat(user, "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>")
return
if (busy)
to_chat(user, "<span class='warning'>The [src.name] is busy right now.</span>")
return
if (istype(O, /obj/item) && !loaded_item)
if(!O.origin_tech)
to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
to_chat(user, "<span class='warning'>You cannot deconstruct this item!</span>")
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>")
return
busy = 1
loaded_item = O
O.loc = src
to_chat(user, "<span class='notice'>You add the [O.name] to the [src.name]!</span>")
flick("d_analyzer_la", src)
spawn(10)
icon_state = "d_analyzer_l"
code/modules/research/experimentor.dm
-17
View File
@@ -130,39 +130,32 @@
if(!checkCircumstances(O))
to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
return
if (disabled)
return
if (!linked_console)
to_chat(user, "<span class='warning'>The [src] must be linked to an R&D console first!</span>")
return
if (loaded_item)
to_chat(user, "<span class='warning'>The [src] is already loaded.</span>")
return
if (istype(O, /obj/item))
if(!O.origin_tech)
to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
to_chat(user, "<span class='warning'>You cannot experiment on this item!</span>")
return
if(O.reliability < 90 && O.crit_fail == 0)
to_chat(usr, "<span class='warning'>Item is neither reliable enough or broken enough to learn from.</span>")
return
if(!user.drop_item())
return
loaded_item = O
O.loc = src
to_chat(user, "<span class='notice'>You add the [O.name] to the machine.</span>")
flick("h_lathe_load", src)
return
@@ -518,7 +511,6 @@
visible_message("<span class='warning'>[src] improves [exp_on], drawing the life essence of those nearby!</span>")
for(var/mob/living/m in view(4,src))
to_chat(m, "<span class='danger'>You feel your flesh being torn from you, mists of blood drifting to [src]!</span>")
m.take_overall_damage(50)
investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor")
var/list/reqs = ConvertReqString2List(exp_on.origin_tech)
@@ -568,17 +560,14 @@
else
if(recentlyExperimented)
to_chat(usr, "<span class='warning'>[src] has been used too recently!</span>")
return
else if(!loaded_item)
updateUsrDialog() //Set the interface to unloaded mode
to_chat(usr, "<span class='warning'>[src] is not currently loaded!</span>")
return
else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item)
updateUsrDialog() //Refresh interface to update interface hrefs
to_chat(usr, "<span class='danger'>Interface failure detected in [src]. Please try again.</span>")
return
var/dotype
if(text2num(scantype) == SCANTYPE_DISCOVER)
@@ -651,7 +640,6 @@
if(revealed)
if(cooldown)
to_chat(user, "<span class='warning'>[src] does not react!</span>")
return
else if(src.loc == user)
cooldown = TRUE
@@ -661,7 +649,6 @@
else
to_chat(user, "<span class='notice'>You aren't quite sure what to do with this, yet.</span>")
//////////////// RELIC PROCS /////////////////////////////
/obj/item/weapon/relic/proc/throwSmoke(turf/where)
@@ -692,7 +679,6 @@
var/message = "<span class='danger'>[src] begans to shake, and in the distance the sound of rampaging animals arises!</span>"
visible_message(message)
to_chat(user, message)
var/animals = rand(1,25)
var/counter
var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
@@ -702,7 +688,6 @@
warn_admins(user, "Mass Mob Spawn")
if(prob(60))
to_chat(user, "<span class='warning'>[src] falls apart!</span>")
qdel(src)
/obj/item/weapon/relic/proc/rapidDupe(mob/user)
@@ -729,7 +714,6 @@
/obj/item/weapon/relic/proc/explode(mob/user)
to_chat(user, "<span class='danger'>[src] begins to heat up!</span>")
spawn(rand(35,100))
if(src.loc == user)
visible_message("<span class='notice'>The [src]'s top opens, releasing a powerful blast!</span>")
@@ -739,7 +723,6 @@
/obj/item/weapon/relic/proc/teleport(mob/user)
to_chat(user, "<span class='notice'>The [src] begins to vibrate!</span>")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
code/modules/research/message_server.dm
-2
View File
@@ -114,9 +114,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/attack_hand(user as mob)
// to_chat(user, "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.")
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
update_icon()
code/modules/research/protolathe.dm
-5
View File
@@ -113,17 +113,14 @@ Note: Must be placed west/left of and R&D console to function.
return 1
else
to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
return 1
if (disabled)
return
if (!linked_console)
to_chat(user, "<span class='warning'> The [src.name] must be linked to an R&D console first!</span>")
return 1
if (busy)
to_chat(user, "<span class='warning'>The [src.name] is busy. Please wait for completion of previous operation.</span>")
return 1
if (O.is_open_container())
return
@@ -134,7 +131,6 @@ Note: Must be placed west/left of and R&D console to function.
if(!materials.has_space( materials.get_item_material_amount(O) ))
to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
return 1
var/obj/item/stack/sheet/stack = O
@@ -148,7 +144,6 @@ Note: Must be placed west/left of and R&D console to function.
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
to_chat(user, "<span class='notice'>You add [amount_inserted] sheets to the [src.name].</span>")
var/stackname = stack.name
src.overlays += "protolathe_[stackname]"
sleep(10)
code/modules/research/rdconsole.dm
-9
View File
@@ -160,20 +160,17 @@ proc/CallMaterialName(ID)
if(istype(D, /obj/item/weapon/disk))
if(t_disk || d_disk)
to_chat(user, "A disk is already loaded into the machine.")
return
if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
else
to_chat(user, "<span class='danger'>Machine cannot accept disks in that format.</span>")
return
if(!user.drop_item())
return
D.loc = src
to_chat(user, "<span class='notice'>You add the disk to the machine!</span>")
else
..()
src.updateUsrDialog()
@@ -186,7 +183,6 @@ proc/CallMaterialName(ID)
emagged = 1
to_chat(user, "<span class='notice'>You disable the security protocols</span>")
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
return 1
@@ -270,7 +266,6 @@ proc/CallMaterialName(ID)
if(linked_destroy.busy)
to_chat(usr, "<span class='danger'> The destructive analyzer is busy at the moment.</span>")
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
linked_destroy.loaded_item = null
@@ -295,7 +290,6 @@ proc/CallMaterialName(ID)
if(linked_destroy)
if(linked_destroy.busy)
to_chat(usr, "<span class='danger'>The destructive analyzer is busy at the moment.</span>")
else
var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
@@ -309,7 +303,6 @@ proc/CallMaterialName(ID)
if(!linked_destroy.hacked)
if(!linked_destroy.loaded_item)
to_chat(usr, "<span class='danger'>The destructive analyzer appears to be empty.</span>")
screen = 1.0
return
if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
@@ -349,7 +342,6 @@ proc/CallMaterialName(ID)
screen = 0.0
if(!sync)
to_chat(usr, "<span class='danger'>You must connect to the network first!</span>")
else
griefProtection() //Putting this here because I dont trust the sync process
spawn(30)
@@ -647,7 +639,6 @@ proc/CallMaterialName(ID)
return 1
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
return 1
interact(user)
code/modules/research/rdmachines.dm
-3
View File
@@ -60,11 +60,9 @@
var/temp_wire = href_list["wire"]
if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
to_chat(usr, "You need a multitool!")
else
if(src.wires[temp_wire])
to_chat(usr, "You can't pulse a cut wire.")
else
if(src.hack_wire == href_list["wire"])
src.hacked = !src.hacked
@@ -80,7 +78,6 @@
if(href_list["cut"])
if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
to_chat(usr, "You need wirecutters!")
else
var/temp_wire = href_list["wire"]
wires[temp_wire] = !wires[temp_wire]
code/modules/research/server.dm
-2
View File
@@ -210,7 +210,6 @@
usr.set_machine(src)
if(!src.allowed(usr) && !emagged)
to_chat(usr, "\red You do not have the required access level")
return
if(href_list["main"])
@@ -339,7 +338,6 @@
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, "\blue You you disable the security protocols")
src.updateUsrDialog()
/obj/machinery/r_n_d/server/core
code/modules/research/xenoarchaeology/artifact/artifact.dm
-3
View File
@@ -82,7 +82,6 @@
user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
if(do_after(user,40, target = src))
to_chat(user, "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
return
if (istype(W, /obj/item/weapon/pickaxe))
@@ -90,12 +89,10 @@
to_chat(user, "\red You start [P.drill_verb] [src].")
if(!do_after(user,P.digspeed, target = src))
return
to_chat(user, "\blue You finish [P.drill_verb] [src].")
excavation_level += P.excavation_amount
if(excavation_level > 100)
code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
-2
View File
@@ -15,13 +15,11 @@
active = 0
icon_state = "gigadrill"
to_chat(user, "\blue You press a button and [src] slowly spins down.")
else
active = 1
icon_state = "gigadrill_mov"
to_chat(user, "\blue You press a button and [src] shudders to life.")
/obj/machinery/giga_drill/Bump(atom/A)
if(active && !drilling_turf)
if(istype(A,/turf/simulated/mineral))
code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
-5
View File
@@ -222,23 +222,19 @@ var/list/valid_secondary_effect_types = list(\
/obj/machinery/artifact/attack_hand(var/mob/user as mob)
if (get_dist(user, src) > 1)
to_chat(user, "\red You can't reach [src] from here.")
return
if(ishuman(user) && user:gloves)
to_chat(user, "<b>You touch [src]</b> with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
return
src.add_fingerprint(user)
if(my_effect.trigger == TRIGGER_TOUCH)
to_chat(user, "<b>You touch [src].<b>")
my_effect.ToggleActivate()
else
to_chat(user, "<b>You touch [src],</b> [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
secondary_effect.ToggleActivate(0)
@@ -322,7 +318,6 @@ var/list/valid_secondary_effect_types = list(\
if(warn)
to_chat(M, "<b>You accidentally touch [src].<b>")
..()
/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)
code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
-1
View File
@@ -13,7 +13,6 @@
/datum/artifact_effect/cold/DoEffectTouch(var/mob/user)
if(holder)
to_chat(user, "\blue A chill passes up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature = max(env.temperature - rand(5,50), 0)
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
-6
View File
@@ -33,11 +33,9 @@
if(prob(50))
if(prob(75))
to_chat(H, "<b><font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
else
to_chat(H, "<font color='red'>[pick(messages)]</font>")
if(prob(50))
H.dizziness += rand(3,5)
@@ -48,11 +46,9 @@
if(prob(5))
if(prob(75))
to_chat(H, "<font color='red'>[pick(messages)]</font>")
else
to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
if(prob(10))
H.dizziness += rand(3,5)
return 1
@@ -64,11 +60,9 @@
if(prob(50))
if(prob(95))
to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
else
to_chat(H, "<font color='red'>[pick(messages)]</font>")
if(prob(50))
H.dizziness += rand(3,5)
else if(prob(25))
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
-3
View File
@@ -11,7 +11,6 @@
for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge += rand() * 100 + 50
to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectAura()
@@ -26,7 +25,6 @@
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += 25
to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectPulse()
@@ -41,5 +39,4 @@
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += rand() * 100
to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
return 1
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
-3
View File
@@ -11,7 +11,6 @@
for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge = max(D.charge - rand() * 100, 0)
to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!")
return 1
return 1
@@ -28,7 +27,6 @@
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - 50,0)
to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
return 1
/datum/artifact_effect/celldrain/DoEffectPulse()
@@ -43,5 +41,4 @@
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - rand() * 150,0)
to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
return 1
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
-6
View File
@@ -31,11 +31,9 @@
if(prob(50))
if(prob(75))
to_chat(H, "<b><font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
else
to_chat(H, "<font color='blue'>[pick(messages)]</font>")
if(prob(50))
H.dizziness += rand(3,5)
@@ -46,11 +44,9 @@
if(prob(5))
if(prob(75))
to_chat(H, "<font color='blue'>[pick(messages)]</font>")
else
to_chat(H, "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
if(prob(5))
H.dizziness += rand(3,5)
return 1
@@ -62,11 +58,9 @@
if(prob(50))
if(prob(95))
to_chat(H, "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
else
to_chat(H, "<font color='blue'>[pick(messages)]</font>")
if(prob(50))
H.dizziness += rand(3,5)
else if(prob(25))
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
-3
View File
@@ -11,7 +11,6 @@
var/mob/living/carbon/C = toucher
to_chat(C, "\blue You feel a soothing energy invigorate you.")
if(ishuman(toucher))
var/mob/living/carbon/human/H = toucher
for(var/obj/item/organ/external/affecting in H.organs)
@@ -44,7 +43,6 @@
if(prob(weakness * 100))
if(prob(10))
to_chat(C, "\blue You feel a soothing energy radiating from something nearby.")
C.adjustBruteLoss(-1 * weakness)
C.adjustFireLoss(-1 * weakness)
C.adjustToxLoss(-1 * weakness)
@@ -60,7 +58,6 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
to_chat(C, "\blue A wave of energy invigorates you.")
C.adjustBruteLoss(-5 * weakness)
C.adjustFireLoss(-5 * weakness)
C.adjustToxLoss(-5 * weakness)
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
-1
View File
@@ -16,7 +16,6 @@
/datum/artifact_effect/heat/DoEffectTouch(var/mob/user)
if(holder)
to_chat(user, "\red You feel a wave of heat travel up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature += rand(5,50)
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
-3
View File
@@ -9,7 +9,6 @@
if(iscarbon(toucher) && prob(weakness * 100))
var/mob/living/carbon/C = toucher
to_chat(C, "\red A painful discharge of energy strikes you!")
C.adjustOxyLoss(rand(5,25) * weakness)
C.adjustToxLoss(rand(5,25) * weakness)
C.adjustBruteLoss(rand(5,25) * weakness)
@@ -28,7 +27,6 @@
if(prob(weakness * 100))
if(prob(10))
to_chat(C, "\red You feel a painful force radiating from something nearby.")
C.adjustBruteLoss(1 * weakness)
C.adjustFireLoss(1 * weakness)
C.adjustToxLoss(1 * weakness)
@@ -43,7 +41,6 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
to_chat(C, "\red A wave of painful energy strikes you!")
C.adjustBruteLoss(3 * weakness)
C.adjustFireLoss(3 * weakness)
C.adjustToxLoss(3 * weakness)
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
-3
View File
@@ -11,7 +11,6 @@
if (istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
to_chat(R, "\blue Your systems report damaged components mending by themselves!")
R.adjustBruteLoss(rand(-10,-30))
R.adjustFireLoss(rand(-10,-30))
return 1
@@ -22,7 +21,6 @@
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!")
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
M.updatehealth()
@@ -33,7 +31,6 @@
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
M.adjustBruteLoss(-10)
M.adjustFireLoss(-10)
M.updatehealth()
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
-3
View File
@@ -11,7 +11,6 @@
if (istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
to_chat(R, "\red Your systems report severe damage has been inflicted!")
R.adjustBruteLoss(rand(10,50))
R.adjustFireLoss(rand(10,50))
return 1
@@ -22,7 +21,6 @@
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!")
M.adjustBruteLoss(1)
M.adjustFireLoss(1)
M.updatehealth()
@@ -33,7 +31,6 @@
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!")
M.adjustBruteLoss(10)
M.adjustFireLoss(10)
M.updatehealth()
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
-6
View File
@@ -13,13 +13,11 @@
if(ishuman(toucher) && prob(weakness * 100))
var/mob/living/carbon/human/H = toucher
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness)
H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness)
return 1
else if(isrobot(toucher))
to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectAura()
@@ -30,12 +28,10 @@
if(prob(weakness * 100))
if(prob(10))
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness)
H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness)
for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectPulse()
@@ -45,10 +41,8 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness)
H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
-4
View File
@@ -12,7 +12,6 @@
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(susceptibility * 100))
to_chat(C, "\red A powerful force overwhelms your consciousness.")
C.Weaken(rand(1,10) * susceptibility)
C.stuttering += 30 * susceptibility
C.Stun(rand(1,10) * susceptibility)
@@ -24,7 +23,6 @@
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(10 * susceptibility))
to_chat(C, "\red Your body goes numb for a moment.")
C.Weaken(2)
C.stuttering += 2
if(prob(10))
@@ -32,7 +30,6 @@
else if(prob(10))
to_chat(C, "\red You feel numb.")
/datum/artifact_effect/stun/DoEffectPulse()
if(holder)
var/turf/T = get_turf(holder)
@@ -40,7 +37,6 @@
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(100 * susceptibility))
to_chat(C, "\red A wave of energy overwhelms your senses!")
C.SetWeakened(4 * susceptibility)
C.stuttering = 4 * susceptibility
if(prob(10))
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
-3
View File
@@ -7,7 +7,6 @@
var/weakness = GetAnomalySusceptibility(user)
if(prob(100 * weakness))
to_chat(user, "\red You are suddenly zapped away elsewhere!")
if (user.buckled)
user.buckled.unbuckle_mob()
@@ -27,7 +26,6 @@
var/weakness = GetAnomalySusceptibility(M)
if(prob(100 * weakness))
to_chat(M, "\red You are displaced by a strange force!")
if(M.buckled)
M.buckled.unbuckle_mob()
@@ -47,7 +45,6 @@
var/weakness = GetAnomalySusceptibility(M)
if(prob(100 * weakness))
to_chat(M, "\red You are displaced by a strange force!")
if(M.buckled)
M.buckled.unbuckle_mob()
code/modules/research/xenoarchaeology/chemistry.dm
-1
View File
@@ -94,7 +94,6 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/
if(new_label)
name = "solution tray ([new_label])"
to_chat(user, "\blue You write on the label of the solution tray.")
else
..(W, user)
code/modules/research/xenoarchaeology/finds/finds_fossils.dm
-1
View File
@@ -76,7 +76,6 @@
else
src.desc = "Incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones."
to_chat(user, "Looks like it could use [src.breq-src.bnum] more bones.")
else
..()
else if(istype(W,/obj/item/weapon/pen))
code/modules/research/xenoarchaeology/finds/finds_misc.dm
-1
View File
@@ -37,7 +37,6 @@
continue
G.attackby(NG, user, params)
to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.")
//SN src = null
qdel(src)
return
code/modules/research/xenoarchaeology/finds/finds_special.dm
-2
View File
@@ -130,7 +130,6 @@
var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot")
M.apply_damage(rand(5, 10), BRUTE, target)
to_chat(M, "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.")
var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc)
B.target_turf = pick(range(1, src))
B.blood_DNA = list()
@@ -202,4 +201,3 @@
/obj/effect/shadow_wight/Bump(var/atom/obstacle)
to_chat(obstacle, "\red You feel a chill run down your spine!")
code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
-4
View File
@@ -53,7 +53,6 @@
w.Add("[lowertext(seperate[next])]")
// to_chat(world, "Adding [lowertext(seperate[next])] to [lowertext(seperate[Xa])]")
if(prob(30))
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focussing on [source]...",\
@@ -68,12 +67,10 @@
//set src in view()
for(var/v in heard_words)
to_chat(world, "[uppertext(v)]")
var/list/d = heard_words["[v]"]
for(var/X in d)
to_chat(world, "[X]")*/
/datum/talking_atom/proc/SaySomething(var/word = null)
if(!holder_atom)
return
@@ -125,5 +122,4 @@
for(var/mob/M in listening)
to_chat(M, "\icon[holder_atom] <b>[holder_atom]</b> reverberates, \blue\"[msg]\"")
last_talk_time = world.time
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
-2
View File
@@ -197,14 +197,12 @@ datum/genesequence
pod1.biomass -= CLONE_BIOMASS
else
to_chat(usr, "\red \icon[src] Unable to locate cloning pod!")
else
..()
/obj/machinery/computer/reconstitutor/Topic(href, href_list)
if(href_list["insertpos"])
// to_chat(world, "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]")
var/sequence_num = text2num(href_list["sequence_num"])
var/insertpos = text2num(href_list["insertpos"])
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
-2
View File
@@ -25,14 +25,12 @@
if(istype(I,/obj/item/weapon/anobattery))
if(!inserted_battery)
to_chat(user, "\blue You insert [I] into [src].")
user.drop_item()
I.loc = src
src.inserted_battery = I
updateDialog()
else
to_chat(user, "\red There is already a battery in [src].")
else
return..()
code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
-6
View File
@@ -63,7 +63,6 @@
/obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(scanning)
to_chat(user, "<span class='warning'>You can't do that while [src] is scanning!</span>")
else
if(istype(I, /obj/item/stack/nanopaste))
var/choice = alert("What do you want to do with the nanopaste?","Radiometric Scanner","Scan nanopaste","Fix seal integrity")
@@ -80,7 +79,6 @@
var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume)
G.reagents.trans_to(src, amount_transferred)
to_chat(user, "<span class='info'>You empty [amount_transferred]u of coolant into [src].</span>")
update_coolant()
return
else if(choice == "Empty coolant")
@@ -88,7 +86,6 @@
var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume)
src.reagents.trans_to(G, amount_transferred)
to_chat(user, "<span class='info'>You remove [amount_transferred]u of coolant from [src].</span>")
update_coolant()
return
user.drop_item()
@@ -335,14 +332,11 @@
scanning = 1
t_left_radspike = pick(5,10,15)
to_chat(usr, "<span class='notice'>Scan initiated.</span>")
else
to_chat(usr, "<span class='warning'>Could not initiate scan, seal requires replacing.</span>")
else
to_chat(usr, "<span class='warning'>Insert an item to scan.</span>")
if(href_list["maserWavelength"])
maser_wavelength = max(min(maser_wavelength + 1000 * text2num(href_list["maserWavelength"]), 10000), 1)
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
-2
View File
@@ -41,7 +41,6 @@
if(istype(I, /obj/item/weapon/anobattery))
if(!inserted_battery)
to_chat(user, "\blue You insert the battery.")
user.drop_item()
I.loc = src
inserted_battery = I
@@ -105,7 +104,6 @@
//apply the touch effect to the holder
if(holder)
to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.")
else
src.loc.visible_message("the \icon[src] [src] shudders.")
inserted_battery.battery_effect.DoEffectTouch(holder)
code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
-5
View File
@@ -13,13 +13,11 @@
if(istype(W, /obj/item/weapon/reagent_containers))
if(held_container)
to_chat(user, "\red You must remove the [held_container] first.")
else
user.drop_item(src)
held_container = W
held_container.loc = src
to_chat(user, "\blue You put the [held_container] onto the [src].")
var/image/I = image("icon"=W, "layer"=FLOAT_LAYER)
underlays += I
if(heating)
@@ -28,19 +26,16 @@
else
to_chat(user, "\red You can't put the [W] onto the [src].")
/obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
if(held_container)
underlays = null
to_chat(user, "\blue You remove the [held_container] from the [src].")
held_container.loc = src.loc
held_container.attack_hand(user)
held_container = null
else
to_chat(user, "\red There is nothing on the [src].")
/obj/machinery/bunsen_burner/proc/try_heating()
src.visible_message("\blue \icon[src] [src] hisses.")
if(held_container && heating)
code/modules/research/xenoarchaeology/tools/suspension_generator.dm
-22
View File
@@ -33,7 +33,6 @@
if(prob(5))
to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(field_type == "iron")
for(var/mob/living/silicon/M in T)
M.Weaken(3)
@@ -41,7 +40,6 @@
if(prob(5))
to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
for(var/obj/item/I in T)
if(!suspension_field.contents.len)
suspension_field.icon_state = "energynet"
@@ -54,7 +52,6 @@
if(prob(5))
to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(cell.charge <= 0)
deactivate()
@@ -124,7 +121,6 @@
activate()
else
to_chat(usr, "<span class='warning'>You are unable to activate [src] until it is properly secured on the ground.</span>")
else
deactivate()
if(href_list["select_field"])
@@ -140,10 +136,8 @@
auth_card = I
if(attempt_unlock(I))
to_chat(usr, "<span class='info'>You insert [I], the console flashes \'<i>Access granted.</a>\'</span>")
else
to_chat(usr, "<span class='warning'>You insert [I], the console flashes \'<i>Access denied.</a>\'</span>")
else if(href_list["ejectcard"])
if(auth_card)
if(ishuman(usr))
@@ -174,7 +168,6 @@
cell = null
to_chat(user, "<span class='info'>You remove the power cell</span>")
/obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/screwdriver))
if(!open)
@@ -183,7 +176,6 @@
else
screwed = 1
to_chat(user, "<span class='info'>You [screwed ? "screw" : "unscrew"] the battery panel.</span>")
else if (istype(W, /obj/item/weapon/crowbar))
if(!locked)
if(!screwed)
@@ -193,17 +185,13 @@
else
open = 1
to_chat(user, "<span class='info'>You crowbar the battery panel [open ? "open" : "in place"].</span>")
icon_state = "suspension[open ? (cell ? "1" : "0") : "2"]"
else
to_chat(user, "<span class='warning'>[src]'s safety locks are engaged, shut it down first.</span>")
else
to_chat(user, "<span class='warning'>Unscrew [src]'s battery panel first.</span>")
else
to_chat(user, "<span class='warning'>[src]'s security locks are engaged.</span>")
else if (istype(W, /obj/item/weapon/wrench))
if(!suspension_field)
if(anchored)
@@ -211,39 +199,32 @@
else
anchored = 1
to_chat(user, "<span class='info'>You wrench the stabilising legs [anchored ? "into place" : "up against the body"].</span>")
if(anchored)
desc = "It is resting securely on four stubby legs."
else
desc = "It has stubby legs bolted up against it's body for stabilising."
else
to_chat(user, "<span class='warning'>You are unable to secure [src] while it is active!</span>")
else if (istype(W, /obj/item/weapon/stock_parts/cell))
if(open)
if(cell)
to_chat(user, "<span class='warning'>There is a power cell already installed.</span>")
else
user.drop_item()
W.loc = src
cell = W
to_chat(user, "<span class='info'>You insert the power cell.</span>")
icon_state = "suspension1"
else if(istype(W, /obj/item/weapon/card))
var/obj/item/weapon/card/I = W
if(!auth_card)
if(attempt_unlock(I))
to_chat(user, "<span class='info'>You swipe [I], the console flashes \'<i>Access granted.</i>\'</span>")
else
to_chat(user, "<span class='warning'>You swipe [I], console flashes \'<i>Access denied.</i>\'</span>")
else
to_chat(user, "<span class='warning'>Remove [auth_card] first.</span>")
/obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/weapon/card/C)
if(!open)
if(istype(C, /obj/item/weapon/card/emag) && cell.charge > 0)
@@ -325,7 +306,6 @@
for(var/mob/M in T)
to_chat(M, "<span class='info'>You no longer feel like floating.</span>")
M.SetWeakened(min(M.weakened, 3))
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
@@ -344,7 +324,6 @@
if(anchored)
to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, 90)
@@ -355,7 +334,6 @@
if(anchored)
to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, -90)
code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
-1
View File
@@ -28,7 +28,6 @@
to_chat(user, "<span class='info'>[message]</span>")
/obj/item/device/ano_scanner/proc/scan()
last_scan_time = world.time
nearest_artifact_distance = -1
code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
-9
View File
@@ -29,17 +29,14 @@
if(..(user, 2))
to_chat(user, "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.")
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/evidencebag))
if(num_stored_bags < 10)
qdel(W)
num_stored_bags += 1
to_chat(user, "\blue You insert the [W] into the core sampler.")
else
to_chat(user, "\red The core sampler can not fit any more bags!")
else
return ..()
@@ -56,10 +53,8 @@
if(geo_data)
if(filled_bag)
to_chat(user, "\red The core sampler is full!")
else if(num_stored_bags < 1)
to_chat(user, "\red The core sampler is out of sample bags!")
else
//create a new sample bag which we'll fill with rock samples
filled_bag = new /obj/item/weapon/evidencebag(src)
@@ -81,15 +76,12 @@
filled_bag.w_class = 1
to_chat(user, "\blue You take a core sample of the [item_to_sample].")
else
to_chat(user, "\red You are unable to take a sample of [item_to_sample].")
/obj/item/device/core_sampler/attack_self()
if(filled_bag)
to_chat(usr, "\blue You eject the full sample bag.")
var/success = 0
if(istype(src.loc, /mob))
var/mob/M = src.loc
@@ -100,4 +92,3 @@
icon_state = "sampler0"
else
to_chat(usr, "\red The core sampler is empty.")
code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
-2
View File
@@ -48,7 +48,6 @@
for(var/mob/L in range(src, 1))
to_chat(L, "\blue \icon[src] [src] pings.")
else if(istype(A,/obj/structure/boulder))
var/obj/structure/boulder/B = A
if(B.artifact_find)
@@ -68,7 +67,6 @@
for(var/mob/L in range(src, 1))
to_chat(L, "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!.")
/obj/item/device/depth_scanner/attack_self(var/mob/user as mob)
return src.interact(user)
code/modules/research/xenobiology/xenobio_camera.dm
-1
View File
@@ -151,7 +151,6 @@
to_chat(owner, "[X] now has [X.monkeys] monkeys left.")
/datum/action/monkey_recycle
name = "Recycle Monkeys"
action_type = AB_INNATE
code/modules/research/xenobiology/xenobiology.dm
-32
View File
@@ -20,14 +20,11 @@
if(istype(O, /obj/item/weapon/slimesteroid2))
if(enhanced == 1)
to_chat(user, "<span class='warning'> This extract has already been enhanced!</span>")
return ..()
if(Uses == 0)
to_chat(user, "<span class='warning'> You can't enhance a used extract!</span>")
return ..()
to_chat(user, "You apply the enhancer. It now has triple the amount of uses.")
Uses = 3
enhanced = 1
qdel(O)
@@ -157,15 +154,12 @@
attack(mob/living/carbon/slime/M as mob, mob/user as mob)
if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
to_chat(user, "<span class='warning'> The potion only works on slimes!</span>")
return ..()
if(M.stat)
to_chat(user, "<span class='warning'> The slime is dead!</span>")
return..()
if(M.mind)
to_chat(user, "<span class='warning'> The slime resists!</span>")
return ..()
if(M.is_adult)
var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
@@ -197,7 +191,6 @@
qdel(src)
to_chat(user, "You feed the slime the potion, removing it's powers and calming it.")
/obj/item/weapon/sentience_potion
name = "sentience potion"
desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being."
@@ -214,15 +207,12 @@
return
if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled
to_chat(user, "<span class='warning'>[M] is already too intelligent for this to work!</span>")
return ..()
if(M.stat)
to_chat(user, "<span class='warning'>[M] is dead!</span>")
return..()
to_chat(user, "<span class='notice'>You offer the sentience potion to [M]...</span>")
being_used = 1
var/list/candidates = pollCandidates("Do you want to play as [M.name]?", ROLE_SENTIENT, 0, 100)
@@ -236,18 +226,14 @@
M.universal_speak = 1
M.faction |= "sentient"
to_chat(M, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")
to_chat(M, "<span class='userdanger'>You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.</span>")
to_chat(user, "<span class='notice'>[M] accepts the potion and suddenly becomes attentive and aware. It worked!</span>")
if(isanimal(M))
var/mob/living/simple_animal/S = M
S.master_commander = user
qdel(src)
else
to_chat(user, "<span class='notice'>[M] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>")
being_used = 0
..()
@@ -264,23 +250,18 @@
attack(mob/living/carbon/slime/M as mob, mob/user as mob)
if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
to_chat(user, "<span class='warning'> The steroid only works on baby slimes!</span>")
return ..()
if(M.is_adult) //Can't tame adults
to_chat(user, "<span class='warning'> Only baby slimes can use the steroid!</span>")
return..()
if(M.stat)
to_chat(user, "<span class='warning'> The slime is dead!</span>")
return..()
if(M.cores == 3)
to_chat(user, "<span class='warning'> The slime already has the maximum amount of extract!</span>")
return..()
to_chat(user, "You feed the slime the steroid. It now has triple the amount of extract.")
M.cores = 3
qdel(src)
@@ -305,14 +286,11 @@
..()
if(!istype(C))
to_chat(user, "<span class='warning'>The potion can only be used on items!</span>")
return
if(C.slowdown <= 0)
to_chat(user, "<span class='warning'>The [C] can't be made any faster!</span>")
return..()
to_chat(user, "<span class='notice'>You slather the red gunk over the [C], making it faster.</span>")
C.color = "#FF0000"
C.slowdown = 0
qdel(src)
@@ -334,14 +312,11 @@
return
if(!istype(C))
to_chat(user, "<span class='warning'>The potion can only be used on clothing!</span>")
return
if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
to_chat(user, "<span class='warning'>The [C] is already fireproof!</span>")
return..()
to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], fireproofing it.</span>")
C.name = "fireproofed [C.name]"
C.color = "#000080"
C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
@@ -507,20 +482,17 @@
for(var/mob/dead/observer/O in src.loc)
if(!check_observer(O))
to_chat(O, "\red You are not eligible to become a golem.")
continue
ghost = O
break
if(!ghost)
to_chat(user, "The rune fizzles uselessly. There is no spirit nearby.")
return
var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
G.change_gender(pick(MALE,FEMALE))
G.loc = src.loc
G.key = ghost.key
to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
qdel(src)
@@ -531,7 +503,6 @@
if(A)
to_chat(O, "\blue <b>Golem rune created in [A.name]. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>")
Topic(href,href_list)
if("signup" in href_list)
var/mob/dead/observer/O = locate(href_list["signup"])
@@ -556,12 +527,9 @@
if(O in ghosts)
ghosts.Remove(O)
to_chat(O, "\red You are no longer signed up to be a golem.")
else
if(!check_observer(O))
to_chat(O, "\red You are not eligible to become a golem.")
return
ghosts.Add(O)
to_chat(O, "\blue You are signed up to be a golem.")