cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Powerful Mechs (#12193)

Browse Source
This commit is contained in:
Geeves
2021-08-31 18:05:09 +02:00
committed by GitHub
parent 6c5e9aa111
commit 15aaa4e873
31 changed files with 173 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/ert/ap_eridani.dm
+2
View File
@@ -37,6 +37,8 @@
/obj/item/grenade/flashbang = 1
)
id_iff = IFF_ERIDANI
/datum/outfit/admin/ert/ap_eridani/get_id_access()
return get_distress_access()
code/datums/outfits/ert/deathsquad.dm
+2
View File
@@ -25,6 +25,8 @@
var/syndie = FALSE
id_iff = IFF_DEATHSQUAD
/datum/outfit/admin/deathsquad/leader
name = "Asset Protection Lead"
code/datums/outfits/ert/fsf.dm
+2
View File
@@ -28,6 +28,8 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1)
id_iff = IFF_FSF
/datum/outfit/admin/ert/fsf/get_id_access()
return get_distress_access_lesser()
code/datums/outfits/ert/iac.dm
+2
View File
@@ -36,6 +36,8 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
id_iff = IFF_IAC
/datum/outfit/admin/ert/iac/get_id_access()
return get_distress_access()
code/datums/outfits/ert/kataphract.dm
+2
View File
@@ -26,6 +26,8 @@
/obj/item/storage/box/donkpockets = 1
)
id_iff = IFF_KATAPHRACT
/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H?.w_uniform)
H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
code/datums/outfits/ert/mercenary.dm
+2
View File
@@ -32,6 +32,8 @@
/obj/item/material/knife/trench = 1
)
id_iff = IFF_FREELANCER
/datum/outfit/admin/ert/mercenary/get_id_access()
return get_distress_access_lesser()
code/datums/outfits/ert/syndicate.dm
+3 -1
View File
@@ -6,7 +6,7 @@
mask = /obj/item/clothing/mask/gas/syndicate
l_ear = /obj/item/device/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/thermal
id = /obj/item/card/id/syndicate_ert
id = /obj/item/card/id/syndicate/ert
l_pocket = /obj/item/ammo_magazine/c45m
l_hand = /obj/item/gun/projectile/automatic/rifle/sts35
@@ -22,6 +22,8 @@
syndie = TRUE
id_iff = IFF_SYNDICATE
/datum/outfit/admin/deathsquad/syndicate/leader
name = "Syndicate Commando Lead"
code/datums/outfits/ert/tcfl.dm
+2
View File
@@ -12,6 +12,8 @@
backpack_contents = null
id_iff = IFF_TCFL
/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(isvaurca(H))
code/datums/outfits/event/outfit_events.dm
+3
View File
@@ -35,6 +35,7 @@
)
id = /obj/item/card/id/syndicate
id_iff = IFF_LANCER
var/id_access = "Lancer"
/datum/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly)
@@ -141,6 +142,8 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1)
id_iff = IFF_SOL
/datum/outfit/admin/event/sol_marine/heavy
name = "Heavy Solarian Marine"
code/datums/outfits/event/outfit_killers.dm
+1
View File
@@ -33,6 +33,7 @@
r_pocket = /obj/item/cloaking_device
id = /obj/item/card/id/syndicate
pda = /obj/item/modular_computer/handheld/pda/command
id_iff = IFF_SYNDICATE
/datum/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
code/datums/outfits/event/outfit_megacorps.dm
+5 -1
View File
@@ -26,6 +26,7 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
)
id_iff = IFF_HEPH
/datum/outfit/admin/megacorp/hephaestus_trooper/heavy
name = "Hephaestus Heavy Asset Protection"
@@ -68,6 +69,7 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/flashbang = 2
)
id_iff = IFF_ZENGHU
/datum/outfit/admin/megacorp/zenghu_trooper/heavy
name = "Zeng Hu Pharmaceuticals Heavy Asset Protection"
@@ -111,6 +113,7 @@
/obj/item/ammo_magazine/mc9mmt = 2,
/obj/item/ammo_magazine/mc9mm = 3
)
id_iff = IFF_ZAVOD
/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy
name = "Zavodskoi Interstellar Heavy Asset Protection"
@@ -152,4 +155,5 @@
/obj/item/grenade/flashbang = 2,
/obj/item/handcuffs = 2,
/obj/item/grenade/frag = 1
)
)
id_iff = IFF_EE
code/datums/outfits/event/outfit_tfcl.dm
+2
View File
@@ -23,6 +23,8 @@
/obj/item/ammo_magazine/a454 = 2,
/obj/item/shield/energy/legion = 1
)
id_iff = IFF_TCFL
var/id_access = "NanoTrasen Representative"
/datum/outfit/admin/tcfl/get_id_access()
code/datums/outfits/outfit.dm
+2
View File
@@ -103,6 +103,8 @@
var/double_headset = /obj/item/device/radio/headset/alt/double
var/wrist_radio = /obj/item/device/radio/headset/wrist
var/id_iff = IFF_DEFAULT // when spawning in, the ID will be set to this iff, preventing friendly fire
var/internals_slot = null //ID of slot containing a gas tank
var/list/backpack_contents = list() //In the list(path=count,otherpath=count) format
var/list/accessory_contents = list()
code/datums/outfits/outfit_antag.dm
+17
View File
@@ -25,6 +25,8 @@
/obj/item/device/multitool = 1
)
id_iff = IFF_SYNDICATE
var/id_access = "Syndicate Operative"
var/uplink_uses = DEFAULT_TELECRYSTAL_AMOUNT
@@ -155,6 +157,8 @@
/obj/item/reagent_containers/pill/cyanide = 1
)
id_iff = IFF_MERCENARY
/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -176,6 +180,7 @@
/obj/item/device/multitool/hacktool = 1
)
id_iff = IFF_LONER
id_access = "Lone Operative"
/datum/outfit/admin/syndicate/raider
@@ -318,7 +323,9 @@
/obj/item/clothing/glasses/thermal,
/obj/item/clothing/glasses/thermal/aviator
)
id = /obj/item/storage/wallet/random
id_iff = IFF_RAIDER
accessory = /obj/item/clothing/accessory/storage/webbing
@@ -418,6 +425,8 @@
backpack_contents = list()
id_iff = IFF_BURGLAR
/datum/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -488,6 +497,7 @@
l_pocket = /obj/item/pinpointer
id = /obj/item/card/id/highlander
id_iff = IFF_HIGHLANDER
/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
@@ -517,6 +527,8 @@
r_hand = /obj/item/melee/cultblade
id_iff = IFF_CULTIST
/datum/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return
@@ -547,6 +559,8 @@
accessory = /obj/item/clothing/accessory/storage/webbing
backpack_contents = list()
id_iff = IFF_BLUESPACE
/datum/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/list/loadouts = list("Nature", "Techno", "Cobra", "Brawler", "Shimmer")
if(H.gender in list(FEMALE, PLURAL, NEUTER))
@@ -617,6 +631,7 @@
allow_backbag_choice = FALSE
l_ear = /obj/item/device/radio/headset/bluespace
id_iff = IFF_BLUESPACE
/datum/outfit/admin/techomancer
name = "Technomancer"
@@ -634,6 +649,8 @@
l_pocket = /obj/item/technomancer_catalog
id = /obj/item/card/id/bluespace
id_iff = IFF_BLUESPACE
var/id_assignment = "Technomagus"
/datum/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)