From d66e7471d3ed8f35e2b6122b2d7c247239e7fef6 Mon Sep 17 00:00:00 2001 From: nl-208 Date: Sat, 11 Apr 2020 03:11:22 -0400 Subject: [PATCH 1/4] fix spelling/grammar in envirosuit files, correct one last error in envhelmet files --- code/modules/clothing/spacesuits/plasmamen.dm | 4 ++-- .../under/jobs/plasmamen/civilian_service.dm | 12 ++++++------ .../clothing/under/jobs/plasmamen/engineering.dm | 6 +++--- code/modules/clothing/under/jobs/plasmamen/medsci.dm | 2 +- .../clothing/under/jobs/plasmamen/security.dm | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 8421feb96ff..3febdaa4271 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -68,7 +68,7 @@ on = !on icon_state = "[initial(icon_state)][on ? "-light":""]" item_state = icon_state - + var/mob/living/carbon/human/H = user if(istype(H)) H.update_inv_head() @@ -185,7 +185,7 @@ /obj/item/clothing/head/helmet/space/plasmaman/mining name = "mining plasma envirosuit helmet" - desc = "A khaki helmet given to plasmamen miners operating on Lavaland." + desc = "A khaki helmet given to plasmaman miners operating on Lavaland." icon_state = "explorer_envirohelm" item_state = "explorer_envirohelm" visor_icon = "explorer_envisor" diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 0ef8df4d57b..ea2f0db6812 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -1,13 +1,13 @@ /obj/item/clothing/under/plasmaman/cargo name = "cargo plasma envirosuit" - desc = "A joint envirosuit used by plasmamen quartermasters and cargo techs alike, due to the logistical problems of differenciating the two with the length of their pant legs." + desc = "An envirosuit used by plasmaman quartermasters and cargo techs alike, due to the logistical problems of differentiating the two by the length of their pant legs." icon_state = "cargo_envirosuit" item_state = "cargo_envirosuit" item_color = "cargo_envirosuit" /obj/item/clothing/under/plasmaman/mining name = "mining plasma envirosuit" - desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen." + desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen." icon_state = "explorer_envirosuit" item_state = "explorer_envirosuit" item_color = "explorer_envirosuit" @@ -15,14 +15,14 @@ /obj/item/clothing/under/plasmaman/chef name = "chef's plasma envirosuit" - desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef." + desc = "A white plasmaman envirosuit designed for culinary practices. One might question why a member of a species that doesn't need to eat would become a chef." icon_state = "chef_envirosuit" item_state = "chef_envirosuit" item_color = "chef_envirosuit" /obj/item/clothing/under/plasmaman/enviroslacks name = "enviroslacks" - desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike." + desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, lawyers, and bartenders alike." icon_state = "enviroslacks" item_state = "enviroslacks" item_color = "enviroslacks" @@ -36,14 +36,14 @@ /obj/item/clothing/under/plasmaman/librarian name = "librarian's plasma envirosuit" - desc = "Made out of a modified voidsuit, this suit was Nano-Trasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike." + desc = "Made out of a modified voidsuit, this suit was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike." icon_state = "prototype_envirosuit" item_state = "prototype_envirosuit" item_color = "prototype_envirosuit" /obj/item/clothing/under/plasmaman/janitor name = "janitor's plasma envirosuit" - desc = "A grey and purple envirosuit designated for plasmamen janitors." + desc = "A grey and purple envirosuit designated for plasmaman janitors." icon_state = "janitor_envirosuit" item_state = "janitor_envirosuit" item_color = "janitor_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering.dm b/code/modules/clothing/under/jobs/plasmamen/engineering.dm index 35f99558c1c..02a71afcaf6 100644 --- a/code/modules/clothing/under/jobs/plasmamen/engineering.dm +++ b/code/modules/clothing/under/jobs/plasmamen/engineering.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/plasmaman/engineering name = "engineering plasma envirosuit" - desc = "An air-tight suit designed to be used by plasmamen exployed as engineers, the usual purple stripes being replaced by engineer's orange. It protects the user from fire and acid damage." + desc = "An airtight suit designed to be used by plasmamen employed as engineers, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage." icon_state = "engineer_envirosuit" item_state = "engineer_envirosuit" item_color = "engineer_envirosuit" @@ -8,14 +8,14 @@ /obj/item/clothing/under/plasmaman/engineering/ce name = "chief engineer plasma envirosuit" - desc = "An air-tight suit designed to be used by plasmamen exployed as the chief engineer" + desc = "An airtight suit designed to be used by plasmamen employed as the chief engineer." icon_state = "ce_envirosuit" item_state = "ce_envirosuit" item_color = "ce_envirosuit" /obj/item/clothing/under/plasmaman/atmospherics name = "atmospherics plasma envirosuit" - desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue." + desc = "An airtight suit designed to be used by plasmamen employed as atmos technicians, the usual purple stripes being replaced by atmos' blue." icon_state = "atmos_envirosuit" item_state = "atmos_envirosuit" item_color = "atmos_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/medsci.dm b/code/modules/clothing/under/jobs/plasmamen/medsci.dm index 69e14c0e878..531bc3fb124 100644 --- a/code/modules/clothing/under/jobs/plasmamen/medsci.dm +++ b/code/modules/clothing/under/jobs/plasmamen/medsci.dm @@ -20,7 +20,7 @@ item_color = "scientist_envirosuit" /obj/item/clothing/under/plasmaman/rd - name = "science plasma envirosuit" + name = "rd plasma envirosuit" desc = "A plasmaman envirosuit designed for the research director." icon_state = "rd_envirosuit" item_state = "rd_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/security.dm b/code/modules/clothing/under/jobs/plasmamen/security.dm index 7060037bd90..427969307f4 100644 --- a/code/modules/clothing/under/jobs/plasmamen/security.dm +++ b/code/modules/clothing/under/jobs/plasmamen/security.dm @@ -8,7 +8,7 @@ /obj/item/clothing/under/plasmaman/security/warden name = "warden plasma envirosuit" - desc = "A plasmaman containment suit designed for the warden, white stripes being added to differeciate them from other members of security." + desc = "A plasmaman containment suit designed for the warden, white stripes being added to differentiate them from other members of security." icon_state = "warden_envirosuit" item_state = "warden_envirosuit" item_color = "warden_envirosuit" From d97ed5f11b1f308916be33ef52ef409d4a9543c8 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Wed, 15 Apr 2020 16:18:14 -0400 Subject: [PATCH 2/4] dumb clamp proc --- code/__HELPERS/icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index d70712c0010..4e11dbf4140 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -580,7 +580,7 @@ world var/B = RGB[2] var/Y = (0.2126 * R) + (0.7152 * G) + (0.0722 * B) - return clamp((Y * 0.01), 0, 1) //Returns the brightness of a color in decimal percentage format. Can multiply light_power by this to receive 100% brightness or a lower brightness. Not a higher brightness. + return Clamp((Y * 0.01), 0, 1) //Returns the brightness of a color in decimal percentage format. Can multiply light_power by this to receive 100% brightness or a lower brightness. Not a higher brightness. /proc/HueToAngle(hue) // normalize hsv in case anything is screwy From 80e5d9d182551c4fed0cee16893806481c570238 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 19 Apr 2020 21:50:35 +0200 Subject: [PATCH 3/4] Fixes the collar slot accepting everything + 2 other runtimes --- code/modules/flufftext/Hallucination.dm | 8 ++++---- code/modules/mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/modular_computers/computers/item/laptop.dm | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 97a16638493..32e209f98f6 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -835,16 +835,16 @@ GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/ite //To make it more realistic, I added two gunshots (enough to kill) playsound_local(null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1) var/timer_pause = rand(10,30) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1), timer_pause) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10)) + addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1), timer_pause) + addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10)) if(10) playsound_local(null, 'sound/effects/pray_chaplain.ogg', 50) if(11) //Same as above, but with tasers. playsound_local(null, 'sound/weapons/taser.ogg', 25, 1) var/timer_pause = rand(10,30) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/taser.ogg', 25, 1), timer_pause) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10)) + addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, 'sound/weapons/taser.ogg', 25, 1), timer_pause) + addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10)) //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 73eebc62684..2479f3c0674 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -594,7 +594,7 @@ toggle_ai(initial(AIStatus)) /mob/living/simple_animal/proc/add_collar(obj/item/clothing/accessory/petcollar/P, mob/user) - if(QDELETED(P) || pcollar) + if(!istype(P) || QDELETED(P) || pcollar) return if(user && !user.unEquip(P)) return diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index 7b025087a8b..223627bd69e 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -89,11 +89,13 @@ /obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null) if(screen_on) - to_chat(user, "You close \the [src].") + if(user) + to_chat(user, "You close \the [src].") slowdown = initial(slowdown) w_class = initial(w_class) else - to_chat(user, "You open \the [src].") + if(user) + to_chat(user, "You open \the [src].") slowdown = slowdown_open w_class = w_class_open From 279ac042d87e07bdf561a2d856c5d860bd7da3dc Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 21 Apr 2020 11:50:27 +0200 Subject: [PATCH 4/4] Makes the water tank backpack nuzzle not have antidrop --- code/game/objects/items/weapons/tanks/watertank.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2375c42db65..55dc189fc9b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -119,7 +119,7 @@ amount_per_transfer_from_this = 50 possible_transfer_amounts = list(25,50,100) volume = 500 - flags = NODROP | NOBLUDGEON + flags = NOBLUDGEON container_type = OPENCONTAINER var/obj/item/watertank/tank