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

move all factions to defines

Browse Source
This commit is contained in:
Kashargul
2024-09-12 20:17:41 +02:00
parent 10dc8510b3
commit 8a3520e2e0
217 changed files with 572 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/job_start_landmarks.dm
+3 -3
View File
@@ -19,11 +19,11 @@
/obj/effect/landmark/start/engineer
name = JOB_ENGINEER
/obj/effect/landmark/start/cmo
name = "Chief Medical Officer"
name = JOB_CHIEF_MEDICAL_OFFICER
/obj/effect/landmark/start/chemist
name = "Chemist"
name = JOB_CHEMIST
/obj/effect/landmark/start/medical
name = "Medical Doctor"
name = JOB_MEDICAL_DOCTOR
/obj/effect/landmark/start/paramedic
name = "Paramedic"
/obj/effect/landmark/start/psych
code/game/objects/effects/spiders.dm
+2 -2
View File
@@ -96,7 +96,7 @@
var/spiders_min = 6
var/spiders_max = 24
var/spider_type = /obj/effect/spider/spiderling
var/faction = "spiders"
var/faction = FACTION_SPIDERS
/obj/effect/spider/eggcluster/Initialize()
pixel_x = rand(3,-3)
@@ -155,7 +155,7 @@
var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
var/travelling_in_vent = 0
var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/hunter)
var/faction = "spiders"
var/faction = FACTION_SPIDERS
var/stunted = FALSE
code/game/objects/items/toys/toys.dm
+6 -6
View File
@@ -311,8 +311,8 @@
playsound(src, 'sound/machines/click.ogg', 20, 1)
/obj/item/toy/figure/cmo
name = "Chief Medical Officer action figure"
desc = "A \"Space Life\" brand Chief Medical Officer action figure."
name = JOB_CHIEF_MEDICAL_OFFICER + " action figure"
desc = "A \"Space Life\" brand " + JOB_CHIEF_MEDICAL_OFFICER + " action figure."
icon_state = "cmo"
toysay = "Suit sensors!"
@@ -377,8 +377,8 @@
toysay = "I swear it's not human meat."
/obj/item/toy/figure/chemist
name = "Chemist action figure"
desc = "A \"Space Life\" brand Chemist action figure."
name = JOB_CHEMIST + " action figure"
desc = "A \"Space Life\" brand " + JOB_CHEMIST + " action figure."
icon_state = "chemist"
toysay = "Get your pills!"
@@ -455,8 +455,8 @@
toysay = "One day while..."
/obj/item/toy/figure/md
name = "Medical Doctor action figure"
desc = "A \"Space Life\" brand Medical Doctor action figure."
name = JOB_MEDICAL_DOCTOR + " action figure"
desc = "A \"Space Life\" brand " + JOB_MEDICAL_DOCTOR + " action figure."
icon_state = "md"
toysay = "The patient is already dead!"
code/game/objects/items/weapons/id cards/id_stacks.dm
+5 -2
View File
@@ -85,10 +85,12 @@
/obj/item/weapon/card/id/medical
name = "Medical ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n")
rank = JOB_MEDICAL_DOCTOR
/obj/item/weapon/card/id/medical/chemist
name = "Chemist's ID"
name = JOB_CHEMIST + "'s ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange")
rank = JOB_CHEMIST
/obj/item/weapon/card/id/medical/geneticist
name = "Geneticist's ID"
@@ -107,8 +109,9 @@
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue")
/obj/item/weapon/card/id/medical/head
name = "Chief Medical Officer's ID"
name = JOB_CHIEF_MEDICAL_OFFICER + "'s ID"
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold")
rank = JOB_CHIEF_MEDICAL_OFFICER
//Security
code/game/objects/items/weapons/id cards/station_ids.dm
+6 -5
View File
@@ -218,14 +218,15 @@
icon_state = "medical-id"
primary_color = rgb(189,237,237)
secondary_color = rgb(223,255,255)
rank = JOB_MEDICAL_DOCTOR
/obj/item/weapon/card/id/medical/head
name = "identification card"
desc = "A card which represents care and compassion."
primary_color = rgb(189,237,237)
secondary_color = rgb(255,223,127)
assignment = "Chief Medical Officer"
rank = "Chief Medical Officer"
assignment = JOB_CHIEF_MEDICAL_OFFICER
rank = JOB_CHIEF_MEDICAL_OFFICER
/obj/item/weapon/card/id/security
name = "identification card"
@@ -547,8 +548,8 @@
"Xenobotanist" = "itg_purple",
"Pathfinder" = "itg_purple",
"Explorer" = "itg_purple",
"Chemist" = "itg_white",
"Medical Doctor" = "itg_white",
JOB_CHEMIST = "itg_white",
JOB_MEDICAL_DOCTOR = "itg_white",
"Paramedic" = "itg_white",
"Psychiatrist" = "itg_white",
"Field Medic" = "itg_white",
@@ -578,7 +579,7 @@
/obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user)
if(istype(I, /obj/item/weapon/card/id) && !accessset)
var/obj/item/weapon/card/id/O = I
var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", JOB_CHIEF_ENGINEER, "Chief Medical Officer", JOB_RESEARCH_DIRECTOR, "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG
var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG
if(O.rank in itgdont)
to_chat(user, "<span class='notice'>ITG Cards do not seem to be able to accept the access codes for your ID.</span>")
return
code/game/objects/random/mob_vr.dm
+1 -1
View File
@@ -179,7 +179,7 @@
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
spawn_nothing_percentage = 10
var/faction = "wild animal"
var/faction = FACTION_WILD_ANIMAL
/obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
return pick(