cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

up to field medic

Browse Source
This commit is contained in:
Kashargul
2024-09-12 21:20:47 +02:00
parent 8a3520e2e0
commit 4ba7beeb9c
57 changed files with 277 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/job_start_landmarks.dm
+11 -11
View File
@@ -25,32 +25,32 @@
/obj/effect/landmark/start/medical
name = JOB_MEDICAL_DOCTOR
/obj/effect/landmark/start/paramedic
name = "Paramedic"
name = JOB_PARAMEDIC
/obj/effect/landmark/start/psych
name = "Psychiatrist"
name = JOB_PSYCHIATRIST
/obj/effect/landmark/start/rd
name = JOB_RESEARCH_DIRECTOR
/obj/effect/landmark/start/roboticist
name = "Roboticist"
name = JOB_ROBOTICIST
/obj/effect/landmark/start/scientist
name = "Scientist"
name = JOB_SCIENTIST
/obj/effect/landmark/start/xenobio
name = "Xenobiologist"
name = JOB_XENOBIOLOGIST
/obj/effect/landmark/start/xenobot
name = "Xenobotanist"
name = JOB_XENOBOTANIST
/obj/effect/landmark/start/qm
name = "Quartermaster"
name = JOB_QUARTERMASTER
/obj/effect/landmark/start/cargo
name = "Cargo Technician"
name = JOB_CARGO_TECHNICIAN
/obj/effect/landmark/start/miner
name = JOB_SHAFT_MINER
/* //VOREStation Removal
/obj/effect/landmark/start/pf
name = "Pathfinder"
name = JOB_PATHFINDER
/obj/effect/landmark/start/explorer
name = "Explorer"
name = JOB_EXPLORER
/obj/effect/landmark/start/fieldmedic
name = "Field Medic"
name = JOB_FIELD_MEDIC
*/
/obj/effect/landmark/start/bartender
name = "Bartender"
code/game/objects/items/toys/toys.dm
+12 -12
View File
@@ -353,8 +353,8 @@
toysay = "How do I open this display case?"
/obj/item/toy/figure/cargotech
name = "Cargo Technician action figure"
desc = "A \"Space Life\" brand Cargo Technician action figure."
name = JOB_CARGO_TECHNICIAN + " action figure"
desc = "A \"Space Life\" brand " + JOB_CARGO_TECHNICIAN + " action figure."
icon_state = "cargotech"
toysay = "For Cargonia!"
@@ -413,8 +413,8 @@
toysay = "Oh god, the engine is gonna go!"
/obj/item/toy/figure/geneticist
name = "Geneticist action figure"
desc = "A \"Space Life\" brand Geneticist action figure, which was recently dicontinued."
name = JOB_GENETICIST + " action figure"
desc = "A \"Space Life\" brand " + JOB_GENETICIST + " action figure, which was recently dicontinued."
icon_state = "geneticist"
toysay = "I'm not qualified for this job."
@@ -431,8 +431,8 @@
toysay = "I'm here to win, anything else is secondary."
/obj/item/toy/figure/qm
name = "Quartermaster action figure"
desc = "A \"Space Life\" brand Quartermaster action figure."
name = JOB_QUARTERMASTER + " action figure"
desc = "A \"Space Life\" brand " + JOB_QUARTERMASTER + " action figure."
icon_state = "qm"
toysay = "Hail Cargonia!"
@@ -491,14 +491,14 @@
toysay = "Blowing all of the borgs!"
/obj/item/toy/figure/roboticist
name = "Roboticist action figure"
desc = "A \"Space Life\" brand Roboticist action figure."
name = JOB_ROBOTICIST + " action figure"
desc = "A \"Space Life\" brand " + JOB_ROBOTICIST + " action figure."
icon_state = "roboticist"
toysay = "He asked to be borged!"
/obj/item/toy/figure/scientist
name = "Scientist action figure"
desc = "A \"Space Life\" brand Scientist action figure."
name = JOB_SCIENTIST + " action figure"
desc = "A \"Space Life\" brand " + JOB_SCIENTIST + " action figure."
icon_state = "scientist"
toysay = "Someone else must have made those bombs!"
@@ -533,8 +533,8 @@
toysay = "The analyzer says you're fine!"
/obj/item/toy/figure/paramedic
name = "Paramedic action figure"
desc = "A \"Space Life\" brand Paramedic action figure."
name = JOB_PARAMEDIC + " action figure"
desc = "A \"Space Life\" brand " + JOB_PARAMEDIC + " action figure."
icon_state = "paramedic"
toysay = "WHERE ARE YOU??"
code/game/objects/items/weapons/id cards/id_stacks.dm
+20 -7
View File
@@ -74,6 +74,7 @@
/obj/item/weapon/card/id/gold/captain
name = "Captain's ID"
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold")
rank = JOB_SITE_MANAGER
/obj/item/weapon/card/id/gold/captain/spare
name = "Spare ID"
@@ -93,12 +94,14 @@
rank = JOB_CHEMIST
/obj/item/weapon/card/id/medical/geneticist
name = "Geneticist's ID"
name = JOB_GENETICIST + "'s ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple")
rank = JOB_GENETICIST
/obj/item/weapon/card/id/medical/psych
name = "Psychologist's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown")
rank = JOB_PSYCHIATRIST
/obj/item/weapon/card/id/medical/virologist
name = "Virologist's ID"
@@ -107,6 +110,7 @@
/obj/item/weapon/card/id/medical/emt
name = "Emergency Medical Technician's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue")
rank = JOB_PARAMEDIC
/obj/item/weapon/card/id/medical/head
name = JOB_CHIEF_MEDICAL_OFFICER + "'s ID"
@@ -157,18 +161,22 @@
/obj/item/weapon/card/id/science
name = "Science ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n")
rank = JOB_SCIENTIST
/obj/item/weapon/card/id/science/roboticist
name = "Roboticist's ID"
name = JOB_ROBOTICIST + "'s ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown")
rank = JOB_ROBOTICIST
/obj/item/weapon/card/id/science/xenobiologist
name = "Xenobiologist's ID"
name = JOB_XENOBIOLOGIST + "'s ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange")
rank = JOB_XENOBIOLOGIST
/obj/item/weapon/card/id/science/xenobotanist
name = "Xenobotanist's ID"
name = JOB_XENOBOTANIST + "'s ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green")
rank = JOB_XENOBOTANIST
/obj/item/weapon/card/id/science/head
name = JOB_RESEARCH_DIRECTOR + "'s ID"
@@ -180,6 +188,7 @@
/obj/item/weapon/card/id/cargo
name = "Cargo ID"
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n")
rank = JOB_CARGO_TECHNICIAN
/obj/item/weapon/card/id/cargo/miner
name = "Miner's ID"
@@ -187,8 +196,9 @@
rank = JOB_SHAFT_MINER
/obj/item/weapon/card/id/cargo/head
name = "Quartermaster's ID"
name = JOB_QUARTERMASTER + "'s ID"
initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white")
rank = JOB_QUARTERMASTER
//Civilian
@@ -255,14 +265,17 @@
/obj/item/weapon/card/id/exploration
name = "Exploration ID"
initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n")
rank = JOB_EXPLORER
/obj/item/weapon/card/id/exploration/fm
name = "Field Medic's ID"
name = JOB_FIELD_MEDIC + "'s ID"
initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu")
rank = JOB_FIELD_MEDIC
/obj/item/weapon/card/id/exploration/head
name = "Pathfinder's ID"
name = JOB_PATHFINDER + "'s ID"
initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white")
rank = JOB_PATHFINDER
//Talon
code/game/objects/items/weapons/id cards/station_ids.dm
+13 -13
View File
@@ -294,8 +294,8 @@
desc = "A card which represents service and planning."
primary_color = rgb(142,94,0)
secondary_color = rgb(255,223,127)
assignment = "Quartermaster"
rank = "Quartermaster"
assignment = JOB_QUARTERMASTER
rank = JOB_QUARTERMASTER
/obj/item/weapon/card/id/assistant
assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant
@@ -524,8 +524,8 @@
var/list/jobs_to_icon = list( //ITG only has a few kinds of icons so we have to group them up!
"Pilot" = "itg",
"Visitor" = "itg",
"Quartermaster" = "itg",
"Cargo Technician" = "itg",
JOB_QUARTERMASTER = "itg",
JOB_CARGO_TECHNICIAN = "itg",
JOB_SHAFT_MINER = "itg",
"Intern" = "itg",
"Talon Pilot" = "itg",
@@ -542,17 +542,17 @@
JOB_DETECTIVE = "itg_red",
JOB_SECURITY_OFFICER = "itg_red",
"Talon Guard" = "itg_red",
"Roboticist" = "itg_purple",
"Scientist" = "itg_purple",
"Xenobiologist" = "itg_purple",
"Xenobotanist" = "itg_purple",
"Pathfinder" = "itg_purple",
"Explorer" = "itg_purple",
JOB_ROBOTICIST = "itg_purple",
JOB_SCIENTIST = "itg_purple",
JOB_XENOBIOLOGIST = "itg_purple",
JOB_XENOBOTANIST = "itg_purple",
JOB_PATHFINDER = "itg_purple",
JOB_EXPLORER = "itg_purple",
JOB_CHEMIST = "itg_white",
JOB_MEDICAL_DOCTOR = "itg_white",
"Paramedic" = "itg_white",
"Psychiatrist" = "itg_white",
"Field Medic" = "itg_white",
JOB_PARAMEDIC = "itg_white",
JOB_PSYCHIATRIST = "itg_white",
JOB_FIELD_MEDIC = "itg_white",
"Talon Doctor" = "itg_white",
JOB_ATMOSPHERIC_TECHNICIAN = "itg_orange",
JOB_ENGINEER = "itg_orange",
code/game/objects/structures/props/swarm.dm
+2 -2
View File
@@ -14,11 +14,11 @@
/obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living))
var/mob/living/L = mover
if(L.faction == "swarmer")
if(L.faction == FACTION_SWARMER)
return TRUE
else if(istype(mover, /obj/item/projectile))
var/obj/item/projectile/P = mover
if(istype(P.firer) && P.firer.faction == "swarmer")
if(istype(P.firer) && P.firer.faction == FACTION_SWARMER)
return TRUE
return ..()