Skip to content

Commit

Permalink
the inteqqing
Browse files Browse the repository at this point in the history
  • Loading branch information
@Erikafox
Erikafox committed Nov 15, 2023
1 parent 899439b commit d10f186
Show file tree
Hide file tree
Showing 19 changed files with 275 additions and 225 deletions.
2 changes: 1 addition & 1 deletion _maps/configs/independent_beluga.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"slots": 1
},
"Private Security Officer": {
"outfit": "/datum/outfit/job/security/inteq/beluga",
"outfit": "/datum/outfit/job/inteq/security/beluga",
"slots": 2
},
"High-Class Passenger": {
Expand Down
14 changes: 7 additions & 7 deletions _maps/configs/inteq_colossus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq/naked",
"outfit": "/datum/outfit/job/inteq/captain",
"officer": true,
"slots": 1
},
"Master At Arms": {
"outfit": "/datum/outfit/job/warden/inteq",
"outfit": "/datum/outfit/job/inteq/warden",
"officer": true,
"slots": 1
},
"Artificer": {
"outfit": "/datum/outfit/job/engineer/inteq",
"outfit": "/datum/outfit/job/inteq/engineer",
"slots": 1
},
"Corpsman": {
"outfit": "/datum/outfit/job/paramedic/inteq",
"outfit": "/datum/outfit/job/inteq/paramedic",
"slots": 1
},
"Enforcer": {
"outfit": "/datum/outfit/job/security/inteq",
"outfit": "/datum/outfit/job/inteq/security",
"slots": 3
},
"Recruit": {
"outfit": "/datum/outfit/job/assistant/inteq",
"slots": 5
"outfit": "/datum/outfit/job/inteq/assistant",
"slots": 1
}
},
"enabled": true
Expand Down
6 changes: 3 additions & 3 deletions _maps/configs/inteq_hound.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
"limit": 2,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq/naked",
"outfit": "/datum/outfit/job/inteq/captain/naked",
"officer": true,
"slots": 1
},
"Enforcer": {
"outfit": "/datum/outfit/job/security/inteq",
"outfit": "/datum/outfit/job/inteq/security",
"slots": 3
},
"Recruit": {
"outfit": "/datum/outfit/job/assistant/inteq",
"outfit": "/datum/outfit/job/inteq/assistant",
"slots": 3
}
},
Expand Down
14 changes: 7 additions & 7 deletions _maps/configs/inteq_talos.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,34 @@
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq",
"outfit": "/datum/outfit/job/inteq/captain/geared",
"officer": true,
"slots": 1
},
"Master At Arms": {
"outfit": "/datum/outfit/job/warden/inteq",
"outfit": "/datum/outfit/job/inteq/warden",
"officer": true,
"slots": 1
},
"Artificer Class II": {
"outfit": "/datum/outfit/job/ce/inteq",
"outfit": "/datum/outfit/job/inteq/ce",
"officer": true,
"slots": 1
},
"Artificer": {
"outfit": "/datum/outfit/job/engineer/inteq",
"outfit": "/datum/outfit/job/inteq/ce",
"slots": 3
},
"Corpsman": {
"outfit": "/datum/outfit/job/paramedic/inteq",
"outfit": "/datum/outfit/job/inteq/paramedic",
"slots": 2
},
"Enforcer": {
"outfit": "/datum/outfit/job/security/inteq",
"outfit": "/datum/outfit/job/inteq/security",
"slots": 1
},
"Recruit": {
"outfit": "/datum/outfit/job/assistant/inteq",
"outfit": "/datum/outfit/job/inteq/assistant",
"slots": 4
}
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/inteq_vaquero.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq/naked",
"outfit": "/datum/outfit/job/inteq/captain",
"officer": true,
"slots": 1
},
"Master At Arms": {
"outfit": "/datum/outfit/job/warden/inteq",
"outfit": "/datum/outfit/job/inteq/warden",
"officer": true,
"slots": 1
},
"Artificer": {
"outfit": "/datum/outfit/job/engineer/inteq",
"outfit": "/datum/outfit/job/inteq/engineer",
"slots": 1
},
"Corpsman": {
"outfit": "/datum/outfit/job/paramedic/inteq",
"outfit": "/datum/outfit/job/inteq/paramedic",
"slots": 1
},
"Enforcer": {
"outfit": "/datum/outfit/job/security/inteq",
"outfit": "/datum/outfit/job/inteq/security",
"slots": 1
},
"Recruit": {
"outfit": "/datum/outfit/job/assistant/inteq",
"outfit": "/datum/outfit/job/inteq/assistant",
"slots": 2
}
},
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/boxes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,7 @@
/obj/item/storage/box/inteqmaid/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/head/maidheadband/inteq = 1,
/obj/item/clothing/under/syndicate/inteq/skirt/maid = 1,
/obj/item/clothing/under/inteq/skirt/maid = 1,
/obj/item/clothing/gloves/combat/maid/inteq = 1,)
generate_items_inside(items_inside,src)

Expand Down
172 changes: 172 additions & 0 deletions code/modules/clothing/outfits/inteq.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
///Inteq Risk Management Group

#define FACTION_PLAYER_INTEQ "playerInteq" //needs to be moved when the file to move it to exists

/datum/outfit/job/inteq
name = "IRMG Empty"

uniform = /obj/item/clothing/under/inteq
box = /obj/item/storage/box/survival

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger/inteq

/datum/outfit/job/inteq/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(visualsOnly)
return
H.faction |= list(FACTION_PLAYER_INTEQ)

///assistants

/datum/outfit/job/inteq/assistant
name = "IRMG Recruit (Inteq)"
jobtype = /datum/job/assistant
r_pocket = /obj/item/radio
belt = /obj/item/pda

///captains

/datum/outfit/job/inteq/captain
name = "IRMG Vanguard (Inteq) (Naked)"
jobtype = /datum/job/captain
ears = /obj/item/radio/headset/inteq/alt/captain
shoes = /obj/item/clothing/shoes/combat
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
jobtype = /datum/job/captain
id = /obj/item/card/id/gold


backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)

/datum/outfit/job/inteq/captain/geared
name = "IRMG Vanguard (Inteq)"

head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
mask = /obj/item/clothing/mask/gas/sechailer/inteq
belt = /obj/item/storage/belt/security/webbing/inteq
suit = /obj/item/clothing/suit/armor/hos/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
gloves = /obj/item/clothing/gloves/combat
accessory = null

///Chief Engineer
/datum/outfit/job/inteq/ce
name = "IRMG Artificer Class II (Inteq)"
jobtype = /datum/job/chief_engineer

ears = /obj/item/radio/headset/inteq
uniform = /obj/item/clothing/under/inteq/artificer
head = /obj/item/clothing/head/hardhat/white
mask = /obj/item/clothing/mask/gas/sechailer/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
belt = /obj/item/storage/belt/utility/full

id = /obj/item/card/id/silver
belt = /obj/item/storage/belt/utility/chief/full
l_pocket = /obj/item/pda/heads/ce

courierbag = /obj/item/storage/backpack/messenger/inteq

backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1)

///paramedic

/datum/outfit/job/inteq/paramedic
name = "IRMG Corpsman (Inteq)"
jobtype = /datum/job/paramedic

uniform = /obj/item/clothing/under/inteq/corpsman
head = /obj/item/clothing/head/soft/inteq/corpsman
suit = /obj/item/clothing/suit/armor/inteq/corpsman
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/storage/belt/medical/webbing/paramedic
ears = /obj/item/radio/headset/headset_medsec/alt

l_pocket = /obj/item/pda/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET

///Security Officers

/datum/outfit/job/inteq/security
name = "IRMG Enforcer (Inteq)"
jobtype = /datum/job/officer

head = /obj/item/clothing/head/helmet/inteq
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/security/webbing/inteq
mask = /obj/item/clothing/mask/gas/sechailer/inteq
uniform = /obj/item/clothing/under/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
gloves = /obj/item/clothing/gloves/combat

backpack = /obj/item/storage/backpack/messenger/inteq
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/pda/security)

/datum/outfit/job/inteq/security/beluga
name = "IRMG Enforcer (Beluga)"

head = /obj/item/clothing/head/beret/sec/inteq
suit = null
belt = null
mask = null
shoes = /obj/item/clothing/shoes/sneakers/black
glasses = null
gloves = /obj/item/clothing/gloves/color/evening

backpack = /obj/item/storage/backpack/messenger/inteq
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/pda/security)

/datum/outfit/job/inteq/security/empty
name = "IRMG Enforcer (Inteq) (Naked)"
head = null
suit = null
belt = null
mask = null
gloves = null

///engineers

/datum/outfit/job/inteq/engineer
name = "IRMG Artificer (Inteq)"
jobtype = /datum/job/engineer

uniform = /obj/item/clothing/under/inteq/artificer
head = /obj/item/clothing/head/soft/inteq
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/storage/belt/utility/full/engi
l_pocket = /obj/item/pda/engineering
r_pocket = /obj/item/t_scanner

//wardens
/datum/outfit/job/inteq/warden
name = "Master At Arms (Inteq)"

ears = /obj/item/radio/headset/inteq/alt
uniform = /obj/item/clothing/under/inteq
head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
mask = /obj/item/clothing/mask/gas/sechailer/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/alt
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
suit_store = null

courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/pda/warden)
4 changes: 3 additions & 1 deletion code/modules/clothing/outfits/standard.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,11 @@
/obj/item/gun/energy/e_gun/adv_stopping = 1
)

//im gonna kill whoever subtyped this
/datum/outfit/job/hos/inteq_honorable
name = "Inteq Honorable vanguard"
head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
uniform = /obj/item/clothing/under/syndicate/inteq/honorable
uniform = /obj/item/clothing/under/inteq/honorable
suit = /obj/item/clothing/suit/armor/hos/inteq/honorable
mask = /obj/item/clothing/mask/gas/sechailer/inteq
gloves = /obj/item/clothing/gloves/combat
Expand All @@ -426,6 +427,7 @@
/datum/outfit/job/hos/inteq_honorable/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
H.faction |= list(FACTION_PLAYER_INTEQ)

var/obj/item/card/id/W = H.wear_id
W.access = get_all_accesses()
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/spacesuits/hardsuit.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,8 @@
//Pointman Hardsuit
/obj/item/clothing/suit/space/hardsuit/syndi/inteq
name = "pointman hardsuit"
desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG."
alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG."
desc = "One of Inteq's finest retrofit combat armors, it is remains pleasantly sturdy while allowing superior mobility. It is in EVA mode."
alt_desc = "One of Inteq's finest retrofit combat armors, it is remains pleasantly sturdy while allowing superior mobility. It is in combat mode."
icon_state = "hardsuit1-pointman"
hardsuit_type = "pointman"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
Expand All @@ -555,8 +555,8 @@

/obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
name = "pointman hardsuit helmet"
desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG."
alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG."
desc = "One of Inteq's finest retrofit combat armors, it is remains pleasantly sturdy while allowing superior mobility. It is in EVA mode."
alt_desc = "One of Inteq's finest retrofit combat armors, it is remains pleasantly sturdy while allowing superior mobility. It is in combat mode."
icon_state = "hardsuit1-pointman"
hardsuit_type = "pointman"
full_retraction = TRUE
Expand Down
Loading

0 comments on commit d10f186

Please sign in to comment.