cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ERT commander id (#94769)

Browse Source 
## About The Pull Request
ERT Commanders id cards now separated from Emergency Responce Team
Intern one, also changed some code where probably should be commander
cards(debug map, ert commander ofc and ert join button)


## Changelog

🆑
fix: ert commander card properly appear in game, no longer overriding
basetype ert card
/🆑
This commit is contained in:
Arceniu
2026-01-07 17:54:47 -05:00
committed by GitHub
parent 945b13e466
commit d6d74517fa
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/debug/runtimestation.dmm
+1 -1
View File
@@ -265,7 +265,7 @@
/area/station/command/bridge)
"bJ" = (
/obj/structure/table,
/obj/item/card/id/advanced/centcom/ert{
/obj/item/card/id/advanced/centcom/ert/commander{
pixel_x = 6;
pixel_y = -6
},
code/game/objects/items/cards_ids.dm
+1 -1
View File
@@ -1375,7 +1375,7 @@
registered_name = "Emergency Response Intern"
trim = /datum/id_trim/centcom/ert
/obj/item/card/id/advanced/centcom/ert
/obj/item/card/id/advanced/centcom/ert/commander
registered_name = JOB_ERT_COMMANDER
trim = /datum/id_trim/centcom/ert/commander
code/modules/admin/verbs/ert.dm
+1 -1
View File
@@ -124,7 +124,7 @@
var/list/spawn_points = GLOB.emergencyresponseteamspawn
var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates("Do you wish to be considered for [span_notice(ertemplate.polldesc)]?", check_jobban = "deathsquad", alert_pic = /obj/item/card/id/advanced/centcom/ert, role_name_text = "emergency response team")
var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates("Do you wish to be considered for [span_notice(ertemplate.polldesc)]?", check_jobban = "deathsquad", alert_pic = /obj/item/card/id/advanced/centcom/ert/commander, role_name_text = "emergency response team")
if(!length(candidates))
message_admins("[key_name_admin(owner)] tried to create a CentCom response team but [owner.p_they()] didn't find any candidates.")
code/modules/clothing/outfits/ert.dm
+2 -2
View File
@@ -38,7 +38,7 @@
/datum/outfit/centcom/ert/commander
name = "ERT Commander"
id = /obj/item/card/id/advanced/centcom/ert
id = /obj/item/card/id/advanced/centcom/ert/commander
back = /obj/item/mod/control/pre_equipped/responsory/commander
l_hand = /obj/item/gun/energy/e_gun
box = /obj/item/storage/box/survival/centcom
@@ -489,7 +489,7 @@
/datum/outfit/centcom/ert/marine
name = "Marine Commander"
id = /obj/item/card/id/advanced/centcom/ert
id = /obj/item/card/id/advanced/centcom/ert/commander
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/ballistic/automatic/wt550
back = /obj/item/shield/riot