cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply more suggestions without doing multiline

Browse Source 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2021-07-23 13:52:43 -04:00
committed by GitHub
co-authored by SabreML
parent 76d64ecc4b
commit 18f3e19051
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclearbomb.dm
+3 -3
View File
@@ -254,11 +254,11 @@ GLOBAL_VAR(bomb_set)
if(panel_open)
if(removal_stage == NUKE_CORE_FULLY_EXPOSED && core)
if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in.
to_chat(user, "<span class='warning'>The [core] won't budge, metal clamps keep it in!</span>")
to_chat(user, "<span class='warning'>[core] won't budge, metal clamps keep it in!</span>")
return
user.visible_message("<span class='notice'>[user] starts to pull [core] out of the [src]!</span>", "<span class='notice'>You start to pull [core] out of the [src]!</span>")
user.visible_message("<span class='notice'>[user] starts to pull [core] out of [src]!</span>", "<span class='notice'>You start to pull [core] out of [src]!</span>")
if(do_after(user, 50, target = src))
user.visible_message("<span class='notice'>[user] pulls [core] out of the [src]!</span>", "<span class='notice'>You pull [core] out of the [src]! Might want to put it somewhere safe.</span>")
user.visible_message("<span class='notice'>[user] pulls [core] out of [src]!</span>", "<span class='notice'>You pull [core] out of [src]! Might want to put it somewhere safe.</span>")
core.forceMove(loc)
core = null
code/game/gamemodes/objective.dm
+1
View File
@@ -449,6 +449,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
else
to_chat(mob, "<span class='userdanger'>Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).</span>")
message_admins("[ADMIN_LOOKUPFLW(mob)] Failed to spawn with their [item_path] theft kit.")
qdel(I)
/datum/objective/steal/exchange
martyr_compatible = 0
code/game/gamemodes/steal_items.dm
+2 -1
View File
@@ -145,7 +145,8 @@
typepath = /obj/item/nuke_core/supermatter_sliver
protected_jobs = list("Chief Engineer", "Engineer", "Atmospheric Technician") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this
location_override = "Engineering. You can use the box and instructions provided to harvest the sliver."
special_equipment =/obj/item/storage/box/syndie_kit/supermatter
special_equipment = /obj/item/storage/box/syndie_kit/supermatter
/datum/theft_objective/plutonium_core
name = "the plutonium core from the stations nuclear device"
typepath = /obj/item/nuke_core/plutonium
code/game/objects/items/theft_items.dm
+5 -5
View File
@@ -31,7 +31,7 @@
return ..()
/obj/item/nuke_core/process()
if(cooldown < world.time - 60)
if(cooldown < world.time - 6 SECONDS)
cooldown = world.time
flick(pulseicon, src)
radiation_pulse(src, 400, 2)
@@ -55,11 +55,11 @@
QDEL_NULL(core)
return ..()
/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/ncore, mob/user)
if(core || !istype(ncore))
/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/new_core, mob/user)
if(core || !istype(new_core))
return FALSE
ncore.forceMove(src)
core = ncore
new_core.forceMove(src)
core = new_core
icon_state = "core_container_loaded"
to_chat(user, "<span class='warning'>Container is sealing...</span>")
addtimer(CALLBACK(src, .proc/seal), 10 SECONDS)