From 4751c138fb1e766261156846443474788e4440a9 Mon Sep 17 00:00:00 2001
From: pubby <temp-email-for-oauth-pubby@gitlab.localhost>
Date: Sat, 25 Jan 2025 06:35:21 +0000
Subject: [PATCH] added missing icons for Paramedics and improved some others +
fixed chemists incorrectly appearing as civilians on crew manifest + better
desc for combat gloves + better sound for meteor shower announcement
---
code/datums/datacore.dm | 4 +++
code/game/jobs/jobs.dm | 2 +-
code/modules/clothing/gloves/miscellaneous.dm | 4 +--
code/modules/events/based/meteors.dm | 2 +-
.../mob/new_player/preferences_setup.dm | 26 ++++++++++++++-----
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 019cbcf0de6..ba85ab7b52b 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -240,6 +240,10 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if("Paramedic")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "scrubsblack_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
if("Geneticist")
clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index c6d145030b5..966f4d43d38 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -70,7 +70,7 @@ var/list/medical_positions = list(
"Chief Medical Officer",
"Medical Doctor",
"Geneticist",
-// "Chemist",
+ "Chemist",
"Paramedic"
)
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index c7ad09aecf2..7a8b683689b 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -18,14 +18,13 @@
item_state = "swat_gl"
siemens_coefficient = 0.50
permeability_coefficient = 0.05
-
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
- desc = "These tactical gloves are somewhat fire and impact resistant."
+ desc = "These tactical gloves are somewhat fire, shock and impact-resistant."
name = "combat gloves"
icon_state = "black"
item_state = "swat_gl"
@@ -44,6 +43,7 @@
siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
permeability_coefficient = 0.01
germ_level = 0
+
/obj/item/clothing/gloves/botanic_leather
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves"
diff --git a/code/modules/events/based/meteors.dm b/code/modules/events/based/meteors.dm
index 91ec50ae575..64aad83668d 100644
--- a/code/modules/events/based/meteors.dm
+++ b/code/modules/events/based/meteors.dm
@@ -100,7 +100,7 @@
/datum/basedevent/meteor/proc/announce()
- command_announcement.Announce("Light meteor shower detected, crew should avoid windows or EVA activities until it has passed.", "Meteor Detection System", new_sound = 'sound/misc/notice2.ogg', msg_sanitized = 1)
+ command_announcement.Announce("Light meteor shower detected, crew should avoid windows or EVA activities until it has passed.", "Meteor Detection System", new_sound = 'sound/AI/meteors.ogg', msg_sanitized = 1)
/datum/basedevent/meteor/storm
name = "Meteor Storm"
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 4c2c1690b07..b3d6bdd76ed 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -410,7 +410,7 @@
clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "toxpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
if(4)
@@ -423,7 +423,7 @@
clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "toxpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
if(4)
@@ -436,7 +436,7 @@
clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "toxpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
if(4)
@@ -450,7 +450,7 @@
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "chempack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
if(4)
@@ -483,6 +483,20 @@
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(PARAMEDIC)
+ clothes_s = new /icon('icons/mob/uniform.dmi', "scrubsblack_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "parker_eliza_arms"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(GENETICIST)
clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
@@ -492,7 +506,7 @@
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "genpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
if(4)
@@ -506,7 +520,7 @@
clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
switch(backbag)
if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "viropack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
if(4)
--
GitLab