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

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/mild.dm
+1 -1
View File
@@ -197,7 +197,7 @@
var/list/mob/living/targets = list()
var/range = 1
if(istype(owner.get_active_hand(), /obj/item/weapon/gun)) //get targets to shoot at
if(istype(owner.get_active_hand(), /obj/item/gun)) //get targets to shoot at
range = 7
for(var/turf/T in oview(owner, range))
targets += T
code/datums/diseases/wizarditis.dm
+2 -2
View File
@@ -84,9 +84,9 @@ STI KALY - blind
else
var/mob/living/carbon/H = affected_mob
if(prob(chance))
if(!istype(H.r_hand, /obj/item/weapon/staff))
if(!istype(H.r_hand, /obj/item/staff))
H.drop_r_hand()
H.put_in_r_hand( new /obj/item/weapon/staff(H) )
H.put_in_r_hand( new /obj/item/staff(H) )
return
return
code/datums/expansions/multitool/circuitboards/stationalert.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/expansion/multitool/circuitboards/stationalert/get_interact_window(var/obj/item/device/multitool/M, var/mob/user)
var/obj/item/weapon/circuitboard/stationalert/SA = holder
var/obj/item/circuitboard/stationalert/SA = holder
. += "<b>Alarm Sources</b><br>"
. += "<table>"
for(var/datum/alarm_handler/AH in SSalarm.all_handlers)
@@ -13,7 +13,7 @@
. += "</table>"
/datum/expansion/multitool/circuitboards/stationalert/on_topic(href, href_list, user)
var/obj/item/weapon/circuitboard/stationalert/SA = holder
var/obj/item/circuitboard/stationalert/SA = holder
if(href_list["add"])
var/datum/alarm_handler/AH = locate(href_list["add"]) in SSalarm.all_handlers
if(AH)
code/datums/helper_datums/teleport.dm
+5 -5
View File
@@ -325,10 +325,10 @@
/datum/teleport/instant/science/setPrecision(aprecision)
..()
if(istype(teleatom, /obj/item/weapon/storage/backpack/holding))
if(istype(teleatom, /obj/item/storage/backpack/holding))
precision = rand(1,100)
var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding)
if(bagholding.len)
precision = max(rand(1,100)*bagholding.len,100)
if(istype(teleatom, /mob/living))
@@ -337,7 +337,7 @@
return 1
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
@@ -346,7 +346,7 @@
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
MM.visible_message("<span class='danger'>\The [MM] bounces off of the portal!</span>","<span class='warning'>Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
@@ -355,7 +355,7 @@
return 0
if(isAdminLevel(destination.z)) //centcomm z-level
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
if(!isemptylist(teleatom.search_contents_for(/obj/item/storage/backpack/holding)))
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
code/datums/mind.dm
+2 -2
View File
@@ -356,7 +356,7 @@
switch(href_list["implant"])
if("remove")
for(var/obj/item/weapon/implant/loyalty/I in H.contents)
for(var/obj/item/implant/loyalty/I in H.contents)
for(var/obj/item/organ/external/organs in H.organs)
if(I in organs.implants)
qdel(I)
@@ -458,7 +458,7 @@
var/is_currently_brigged = 0
if(istype(T.loc,/area/security/brig))
is_currently_brigged = 1
for(var/obj/item/weapon/card/id/card in current)
for(var/obj/item/card/id/card in current)
is_currently_brigged = 0
break // if they still have ID they're not brigged
for(var/obj/item/device/pda/P in current)
code/datums/outfits/ert/ert.dm
+69 -69
View File
@@ -4,18 +4,18 @@
uniform = /obj/item/clothing/under/ert
suit = null
suit_store = null
belt = /obj/item/weapon/storage/belt/military
belt = /obj/item/storage/belt/military
shoes = /obj/item/clothing/shoes/swat
accessory = /obj/item/clothing/accessory/storage/black_vest
gloves = null
id = /obj/item/weapon/card/id/ert
back = /obj/item/weapon/rig/ert/security
id = /obj/item/card/id/ert
back = /obj/item/rig/ert/security
l_ear = /obj/item/device/radio/headset/ert
belt_contents = list(
/obj/item/weapon/handcuffs = 2,
/obj/item/weapon/shield/riot/tact = 1,
/obj/item/handcuffs = 2,
/obj/item/shield/riot/tact = 1,
/obj/item/ammo_magazine/a556 = 2,
/obj/item/ammo_magazine/a556/ap = 1
)
@@ -26,33 +26,33 @@
/datum/outfit/admin/ert/nanotrasen/specialist
name = "Nanotrasen ERT Engineer Specialist"
belt = /obj/item/weapon/storage/belt/utility/full
back = /obj/item/weapon/rig/ert/engineer
belt = /obj/item/storage/belt/utility/full
back = /obj/item/rig/ert/engineer
belt_contents = null
/datum/outfit/admin/ert/nanotrasen/specialist/medical
name = "Nanotrasen ERT Medical Specialist"
belt = /obj/item/weapon/storage/belt/medical
back = /obj/item/weapon/rig/ert/medical
r_hand = /obj/item/weapon/storage/firstaid/combat
belt = /obj/item/storage/belt/medical
back = /obj/item/rig/ert/medical
r_hand = /obj/item/storage/firstaid/combat
belt_contents = list(
/obj/item/weapon/reagent_containers/hypospray = 1,
/obj/item/reagent_containers/hypospray = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/weapon/reagent_containers/glass/bottle/thetamycin = 1
/obj/item/reagent_containers/glass/bottle/thetamycin = 1
)
/datum/outfit/admin/ert/nanotrasen/leader
name = "Nanotrasen ERT Leader"
back = /obj/item/weapon/rig/ert
back = /obj/item/rig/ert
belt_contents = list(
/obj/item/weapon/handcuffs = 1,
/obj/item/weapon/shield/riot/tact = 1,
/obj/item/handcuffs = 1,
/obj/item/shield/riot/tact = 1,
/obj/item/ammo_magazine/a556 = 2,
/obj/item/ammo_magazine/a556/ap = 2
)
@@ -66,11 +66,11 @@
shoes = /obj/item/clothing/shoes/swat
gloves = /obj/item/clothing/gloves/swat
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/weapon/storage/backpack/legion
id = /obj/item/weapon/card/id/distress/legion
back = /obj/item/storage/backpack/legion
id = /obj/item/card/id/distress/legion
backpack_contents = list(
/obj/item/weapon/storage/belt/utility/full = 1
/obj/item/storage/belt/utility/full = 1
)
/datum/outfit/admin/ert/legion/get_id_access()
@@ -79,15 +79,15 @@
/datum/outfit/admin/ert/legion/specialist
name = "TCFL Medic"
l_hand = /obj/item/weapon/storage/firstaid/adv
r_hand = /obj/item/weapon/storage/firstaid/combat
belt = /obj/item/weapon/storage/belt/medical
l_hand = /obj/item/storage/firstaid/adv
r_hand = /obj/item/storage/firstaid/combat
belt = /obj/item/storage/belt/medical
belt_contents = list(
/obj/item/weapon/reagent_containers/hypospray = 1,
/obj/item/reagent_containers/hypospray = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/weapon/reagent_containers/glass/bottle/thetamycin = 1
/obj/item/reagent_containers/glass/bottle/thetamycin = 1
)
//Mercenary
@@ -97,24 +97,24 @@
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/swat
gloves = /obj/item/clothing/gloves/yellow
belt = /obj/item/weapon/storage/belt/military
back = /obj/item/weapon/storage/backpack/satchel_syndie
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack/satchel_syndie
suit = /obj/item/clothing/suit/space/void/merc
head = /obj/item/clothing/head/helmet/space/void/merc
suit_store = /obj/item/weapon/tank/oxygen
id = /obj/item/weapon/card/id/syndicate
suit_store = /obj/item/tank/oxygen
id = /obj/item/card/id/syndicate
l_ear = /obj/item/device/radio/headset/distress
backpack_contents = list(
/obj/item/weapon/gun/projectile/automatic/c20r = 1,
/obj/item/weapon/storage/belt/utility/full = 1
/obj/item/gun/projectile/automatic/c20r = 1,
/obj/item/storage/belt/utility/full = 1
)
belt_contents = list(
/obj/item/ammo_magazine/a10mm = 3,
/obj/item/weapon/handcuffs/ziptie = 2,
/obj/item/weapon/shield/energy = 1
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy = 1
)
/datum/outfit/admin/ert/mercenary/get_id_access()
@@ -123,26 +123,26 @@
/datum/outfit/admin/ert/mercenary/specialist
name = "Mercenary Freelancer Medic"
belt = /obj/item/weapon/storage/belt/medical
l_hand = /obj/item/weapon/storage/firstaid/adv
r_hand = /obj/item/weapon/storage/firstaid/combat
belt = /obj/item/storage/belt/medical
l_hand = /obj/item/storage/firstaid/adv
r_hand = /obj/item/storage/firstaid/combat
backpack_contents = list(
/obj/item/weapon/gun/projectile/automatic/c20r = 1,
/obj/item/gun/projectile/automatic/c20r = 1,
/obj/item/ammo_magazine/a10mm = 2
)
belt_contents = list(
/obj/item/weapon/reagent_containers/hypospray = 1,
/obj/item/reagent_containers/hypospray = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/weapon/reagent_containers/glass/bottle/thetamycin = 1
/obj/item/reagent_containers/glass/bottle/thetamycin = 1
)
/datum/outfit/admin/ert/mercenary/leader
name = "Mercenary Freelancer Leader"
l_hand = /obj/item/weapon/gun/projectile/automatic/rifle/sts35
back = /obj/item/weapon/rig/merc/distress
l_hand = /obj/item/gun/projectile/automatic/rifle/sts35
back = /obj/item/rig/merc/distress
suit_store = null
suit = null
head = null
@@ -151,8 +151,8 @@
belt_contents = list(
/obj/item/ammo_magazine/c762 = 3,
/obj/item/weapon/handcuffs/ziptie = 2,
/obj/item/weapon/shield/energy = 1
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy = 1
)
// Deathsquads -- Admin Spawn Only
@@ -161,24 +161,24 @@
uniform = /obj/item/clothing/under/ert
back = null
belt = /obj/item/weapon/storage/belt/security/tactical
belt = /obj/item/storage/belt/security/tactical
shoes = null
gloves = null
mask = /obj/item/clothing/mask/gas/swat
l_ear = /obj/item/device/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
id = /obj/item/weapon/card/id/asset_protection
l_pocket = /obj/item/weapon/plastique
r_pocket = /obj/item/weapon/melee/energy/sword
l_hand = /obj/item/weapon/gun/energy/rifle/pulse
id = /obj/item/card/id/asset_protection
l_pocket = /obj/item/plastique
r_pocket = /obj/item/melee/energy/sword
l_hand = /obj/item/gun/energy/rifle/pulse
belt_contents = list(
/obj/item/ammo_magazine/a454 = 2,
/obj/item/weapon/melee/baton/loaded = 1,
/obj/item/weapon/shield/energy = 1,
/obj/item/weapon/grenade/flashbang = 2,
/obj/item/weapon/handcuffs = 2,
/obj/item/weapon/grenade/frag = 1
/obj/item/melee/baton/loaded = 1,
/obj/item/shield/energy = 1,
/obj/item/grenade/flashbang = 2,
/obj/item/handcuffs = 2,
/obj/item/grenade/frag = 1
)
var/syndie = FALSE
@@ -186,28 +186,28 @@
/datum/outfit/admin/deathsquad/leader
name = "Asset Protection Lead"
l_pocket = /obj/item/weapon/pinpointer
l_pocket = /obj/item/pinpointer
/datum/outfit/admin/deathsquad/syndicate
name = "Syndicate Commando"
uniform = /obj/item/clothing/under/syndicate
belt = /obj/item/weapon/storage/belt/military/syndicate
belt = /obj/item/storage/belt/military/syndicate
mask = /obj/item/clothing/mask/gas/syndicate
l_ear = /obj/item/device/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/thermal
id = /obj/item/weapon/card/id/syndicate_ert
id = /obj/item/card/id/syndicate_ert
l_pocket = /obj/item/ammo_magazine/c45m
l_hand = /obj/item/weapon/gun/projectile/automatic/rifle/sts35
l_hand = /obj/item/gun/projectile/automatic/rifle/sts35
belt_contents = list(
/obj/item/ammo_magazine/c762 = 3,
/obj/item/weapon/pinpointer = 1,
/obj/item/weapon/shield/energy = 1,
/obj/item/weapon/handcuffs = 1,
/obj/item/weapon/grenade/flashbang = 1,
/obj/item/weapon/grenade/frag = 1,
/obj/item/weapon/plastique = 1
/obj/item/pinpointer = 1,
/obj/item/shield/energy = 1,
/obj/item/handcuffs = 1,
/obj/item/grenade/flashbang = 1,
/obj/item/grenade/frag = 1,
/obj/item/plastique = 1
)
syndie = TRUE
@@ -215,7 +215,7 @@
/datum/outfit/admin/deathsquad/syndicate/leader
name = "Syndicate Commando Lead"
l_pocket = /obj/item/weapon/pinpointer
l_pocket = /obj/item/pinpointer
/datum/outfit/admin/deathsquad/get_id_access()
return get_all_accesses()
@@ -226,13 +226,13 @@
return
var/obj/item/clothing/accessory/holster/armpit/hold = new(H)
var/obj/item/weapon/gun/projectile/weapon
var/obj/item/gun/projectile/weapon
if(syndie)
weapon = new /obj/item/weapon/gun/projectile/silenced(H)
weapon = new /obj/item/gun/projectile/silenced(H)
else
weapon = new /obj/item/weapon/gun/projectile/revolver/mateba(H)
weapon = new /obj/item/gun/projectile/revolver/mateba(H)
if(weapon)
hold.contents += weapon
@@ -241,14 +241,14 @@
var/obj/item/clothing/under/U = H.get_equipped_item(slot_w_uniform)
U.attackby(hold, H)
var/obj/item/weapon/rig/mercrig
var/obj/item/rig/mercrig
if(syndie)
mercrig = new /obj/item/weapon/rig/merc(get_turf(H))
mercrig = new /obj/item/rig/merc(get_turf(H))
else
mercrig = new /obj/item/weapon/rig/ert/assetprotection(get_turf(H))
mercrig = new /obj/item/rig/ert/assetprotection(get_turf(H))
if(mercrig)
H.put_in_hands(mercrig)
H.equip_to_slot_or_del(mercrig, slot_back)
addtimer(CALLBACK(mercrig, /obj/item/weapon/rig/.proc/toggle_seals, H, TRUE), 2 SECONDS)
addtimer(CALLBACK(mercrig, /obj/item/rig/.proc/toggle_seals, H, TRUE), 2 SECONDS)
code/datums/outfits/ert/kataphract_ert.dm
+18 -18
View File
@@ -4,14 +4,14 @@
uniform = /obj/item/clothing/under/unathi
head = /obj/item/clothing/head/helmet/space/void/kataphract
suit = /obj/item/clothing/suit/space/void/kataphract
suit_store = /obj/item/weapon/tank/oxygen/yellow
belt = /obj/item/weapon/melee/energy/sword/pirate/generic
suit_store = /obj/item/tank/oxygen/yellow
belt = /obj/item/melee/energy/sword/pirate/generic
shoes = /obj/item/clothing/shoes/caligae/grey
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/weapon/gun/energy/pistol = 1)
accessory_contents = list(/obj/item/gun/energy/pistol = 1)
gloves = /obj/item/clothing/gloves/black/unathi
id = /obj/item/weapon/card/id/distress/kataphract
back = /obj/item/weapon/storage/backpack/cultpack/adorned
id = /obj/item/card/id/distress/kataphract
back = /obj/item/storage/backpack/cultpack/adorned
l_ear = /obj/item/device/radio/headset/distress
@@ -20,10 +20,10 @@
belt_contents = null
backpack_contents = list(
/obj/item/weapon/handcuffs/ziptie = 2,
/obj/item/weapon/shield/riot/tact = 1,
/obj/item/weapon/crowbar = 1,
/obj/item/weapon/storage/box/donkpockets = 1
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/riot/tact = 1,
/obj/item/crowbar = 1,
/obj/item/storage/box/donkpockets = 1
)
/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -41,22 +41,22 @@
/datum/outfit/admin/ert/kataphract/specialist
name = "Kataphract-Hopeful Spec."
belt = /obj/item/weapon/storage/belt/medical
l_hand = /obj/item/weapon/melee/hammer/powered
belt = /obj/item/storage/belt/medical
l_hand = /obj/item/melee/hammer/powered
belt_contents = list(
/obj/item/weapon/reagent_containers/hypospray = 1,
/obj/item/reagent_containers/hypospray = 1,
/obj/item/stack/medical/advanced/bruise_pack = 1,
/obj/item/stack/medical/advanced/ointment = 1,
/obj/item/weapon/reagent_containers/glass/bottle/thetamycin = 1
/obj/item/reagent_containers/glass/bottle/thetamycin = 1
)
backpack_contents = list(
/obj/item/weapon/handcuffs/ziptie = 2,
/obj/item/weapon/shield/riot/tact = 1,
/obj/item/weapon/storage/box/donkpockets = 1,
/obj/item/weapon/crowbar = 1,
/obj/item/weapon/storage/firstaid/adv = 1
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/riot/tact = 1,
/obj/item/storage/box/donkpockets = 1,
/obj/item/crowbar = 1,
/obj/item/storage/firstaid/adv = 1
)
/datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
code/datums/outfits/outfit.dm
+16 -16
View File
@@ -28,11 +28,11 @@
// Must be paths, used to allow player-pref backpack choice
var/allow_backbag_choice = FALSE
var/backpack = /obj/item/weapon/storage/backpack
var/satchel = /obj/item/weapon/storage/backpack/satchel_norm
var/satchel_alt = /obj/item/weapon/storage/backpack/satchel
var/dufflebag = /obj/item/weapon/storage/backpack/duffel
var/messengerbag = /obj/item/weapon/storage/backpack/messenger
var/backpack = /obj/item/storage/backpack
var/satchel = /obj/item/storage/backpack/satchel_norm
var/satchel_alt = /obj/item/storage/backpack/satchel
var/dufflebag = /obj/item/storage/backpack/duffel
var/messengerbag = /obj/item/storage/backpack/messenger
var/internals_slot = null //ID of slot containing a gas tank
var/list/backpack_contents = list() //In the list(path=count,otherpath=count) format
@@ -48,22 +48,22 @@
if (1)
back = null
if (2)
back = use_job_specific ? backpack : /obj/item/weapon/storage/backpack
back = use_job_specific ? backpack : /obj/item/storage/backpack
if (3)
back = use_job_specific ? satchel : /obj/item/weapon/storage/backpack/satchel_norm
back = use_job_specific ? satchel : /obj/item/storage/backpack/satchel_norm
if (4)
back = use_job_specific ? satchel_alt : /obj/item/weapon/storage/backpack/satchel
back = use_job_specific ? satchel_alt : /obj/item/storage/backpack/satchel
if (5)
back = use_job_specific ? dufflebag : /obj/item/weapon/storage/backpack/duffel
back = use_job_specific ? dufflebag : /obj/item/storage/backpack/duffel
if (6)
back = use_job_specific ? messengerbag : /obj/item/weapon/storage/backpack/messenger
back = use_job_specific ? messengerbag : /obj/item/storage/backpack/messenger
else
back = backpack //Department backpack
if(back)
equip_item(H, back, slot_back)
if(istype(H.back,/obj/item/weapon/storage/backpack))
var/obj/item/weapon/storage/backpack/B = H.back
if(istype(H.back,/obj/item/storage/backpack))
var/obj/item/storage/backpack/B = H.back
B.autodrobe_no_remove = TRUE
return
@@ -110,7 +110,7 @@
else if(istype(A, /obj/item/clothing/accessory/holster))
var/obj/item/clothing/accessory/holster/holster = A
var/w_type = accessory_contents[1]
var/obj/item/weapon/W = new w_type(H.loc)
var/obj/item/W = new w_type(H.loc)
if(W)
holster.holster(W, H)
@@ -190,7 +190,7 @@
if(implants)
for(var/implant_type in implants)
var/obj/item/weapon/implant/I = new implant_type(H)
var/obj/item/implant/I = new implant_type(H)
if(I.implanted(H))
I.forceMove(H)
I.imp_in = H
@@ -241,7 +241,7 @@
H.r_store.add_fingerprint(H, 1)
return 1
/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/weapon/card/id/C)
/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
if(istype(C))
C.access = get_id_access(H)
C.rank = get_id_rank(H)
@@ -252,7 +252,7 @@
C.associated_account_number = H.mind.initial_account.account_number
/datum/outfit/proc/imprint_pda(mob/living/carbon/human/H, obj/item/device/pda/PDA)
var/obj/item/weapon/card/id/C = PDA.id
var/obj/item/card/id/C = PDA.id
PDA.owner = H.real_name
if(istype(PDA) && istype(C))
PDA.ownjob = C.assignment
code/datums/outfits/outfit_admin.dm
+93 -93
View File
@@ -8,7 +8,7 @@
H.mind.assigned_role = name
H.job = name
/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/weapon/card/id/C)
/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
..()
if(id_icon)
C.icon_state = id_icon
@@ -17,24 +17,24 @@
name = "Lancer"
uniform = /obj/item/clothing/under/lance
back = /obj/item/weapon/gun/energy/rifle/pulse
back = /obj/item/gun/energy/rifle/pulse
gloves = /obj/item/clothing/gloves/force/basic
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/weapon/storage/belt/military
belt = /obj/item/storage/belt/military
l_ear = /obj/item/device/radio/headset/ert
id = /obj/item/weapon/card/id/syndicate
suit_store = /obj/item/weapon/tank/oxygen
id = /obj/item/card/id/syndicate
suit_store = /obj/item/tank/oxygen
suit = /obj/item/clothing/suit/space/void/lancer
head = /obj/item/clothing/head/helmet/space/void/lancer
belt_contents = list(
/obj/item/weapon/plastique = 1,
/obj/item/weapon/grenade/frag = 1,
/obj/item/weapon/melee/energy/sword = 1,
/obj/item/weapon/shield/energy = 1,
/obj/item/plastique = 1,
/obj/item/grenade/frag = 1,
/obj/item/melee/energy/sword = 1,
/obj/item/shield/energy = 1,
/obj/item/device/flash = 1,
/obj/item/weapon/handcuffs/ziptie = 2,
/obj/item/weapon/melee/baton/loaded = 1,
/obj/item/weapon/grenade/empgrenade = 1
/obj/item/handcuffs/ziptie = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/empgrenade = 1
)
var/id_access = "Lancer"
@@ -45,19 +45,19 @@
name = "Lance Engineer"
uniform = /obj/item/clothing/under/lance
back = /obj/item/weapon/gun/projectile/shotgun/pump/combat/sol
back = /obj/item/gun/projectile/shotgun/pump/combat/sol
gloves = /obj/item/clothing/gloves/yellow
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/weapon/storage/belt/utility/full
belt = /obj/item/storage/belt/utility/full
l_ear = /obj/item/device/radio/headset/ert
id = /obj/item/weapon/card/id/syndicate
suit_store = /obj/item/weapon/tank/oxygen
id = /obj/item/card/id/syndicate
suit_store = /obj/item/tank/oxygen
suit = /obj/item/clothing/suit/space/void/lancer
head = /obj/item/clothing/head/helmet/space/void/lancer
accessory = /obj/item/clothing/accessory/storage/brown_vest
accessory_contents = list(
/obj/item/weapon/plastique = 3,
/obj/item/weapon/grenade/frag = 1,
/obj/item/plastique = 3,
/obj/item/grenade/frag = 1,
/obj/item/device/flash = 1
)
belt_contents = list(
@@ -74,26 +74,26 @@
uniform = /obj/item/clothing/under/lance
gloves = /obj/item/clothing/gloves/latex/nitrile
shoes = /obj/item/clothing/shoes/magboots
belt = /obj/item/weapon/storage/belt/medical
belt = /obj/item/storage/belt/medical
mask = /obj/item/clothing/mask/surgical
l_ear = /obj/item/device/radio/headset/ert
id = /obj/item/weapon/card/id/syndicate
suit_store = /obj/item/weapon/tank/oxygen
id = /obj/item/card/id/syndicate
suit_store = /obj/item/tank/oxygen
suit = /obj/item/clothing/suit/space/void/lancer
head = /obj/item/clothing/head/helmet/space/void/lancer
accessory = /obj/item/clothing/accessory/holster/thigh
belt_contents = list(
/obj/item/device/healthanalyzer = 1,
/obj/item/weapon/reagent_containers/hypospray/combat = 1,
/obj/item/weapon/reagent_containers/syringe = 1,
/obj/item/weapon/personal_inhaler/combat = 1,
/obj/item/weapon/reagent_containers/personal_inhaler_cartridge/large = 2,
/obj/item/weapon/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 1,
/obj/item/weapon/reagent_containers/glass/bottle/spaceacillin = 1,
/obj/item/reagent_containers/hypospray/combat = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/item/personal_inhaler/combat = 1,
/obj/item/reagent_containers/personal_inhaler_cartridge/large = 2,
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/epinephrine = 1,
/obj/item/reagent_containers/glass/bottle/spaceacillin = 1,
)
accessory_contents = list(/obj/item/weapon/gun/energy/pulse/pistol = 1)
accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1)
var/id_access = "Lance Medic"
/datum/outfit/admin/lance_medic/get_id_access()
@@ -103,17 +103,17 @@
name = "Lance Operative"
uniform = /obj/item/clothing/under/dress/lance_dress/male
back = /obj/item/weapon/storage/backpack/satchel
back = /obj/item/storage/backpack/satchel
gloves = /obj/item/clothing/gloves/latex
shoes = /obj/item/clothing/shoes/laceup
belt = /obj/item/weapon/storage/belt/utility/full
belt = /obj/item/storage/belt/utility/full
l_ear = /obj/item/device/radio/headset/ert
id = /obj/item/weapon/card/id/syndicate
suit_store = /obj/item/weapon/tank/oxygen
id = /obj/item/card/id/syndicate
suit_store = /obj/item/tank/oxygen
suit = /obj/item/clothing/suit/space/void/lancer
head = /obj/item/clothing/head/helmet/space/void/lancer
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/weapon/gun/energy/pulse/pistol = 1)
accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1)
backpack_contents = list(
/obj/item/device/flash = 1,
@@ -131,15 +131,15 @@
name = "NanoTrasen Representative"
uniform = /obj/item/clothing/under/rank/centcom
back = /obj/item/weapon/storage/backpack/satchel
back = /obj/item/storage/backpack/satchel
gloves = /obj/item/clothing/gloves/white
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/heads/hop
glasses = /obj/item/clothing/glasses/sunglasses
id = /obj/item/weapon/card/id
id = /obj/item/card/id
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1
/obj/item/storage/box/engineer = 1
)
id_icon = "centcom"
@@ -175,29 +175,29 @@
l_ear = /obj/item/device/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/beret/centcom/officer/civilprotection
suit_store = /obj/item/weapon/gun/energy/gun
belt = /obj/item/weapon/storage/belt/security
suit_store = /obj/item/gun/energy/gun
belt = /obj/item/storage/belt/security
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1,
/obj/item/storage/box/engineer = 1,
/obj/item/clothing/head/helmet/swat/peacekeeper = 1,
/obj/item/clothing/accessory/holster/hip = 1,
/obj/item/weapon/gun/energy/pistol = 1
/obj/item/gun/energy/pistol = 1
)
implants = list(
/obj/item/weapon/implant/loyalty
/obj/item/implant/loyalty
)
/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && H.belt)
var/obj/item/weapon/reagent_containers/spray/pepper/pepperspray = new(H)
var/obj/item/weapon/melee/baton/loaded/baton = new(H)
var/obj/item/weapon/shield/riot/tact/shield = new(H)
var/obj/item/weapon/grenade/flashbang/flashbang = new(H)
var/obj/item/weapon/handcuffs/cuffs = new(H)
var/obj/item/reagent_containers/spray/pepper/pepperspray = new(H)
var/obj/item/melee/baton/loaded/baton = new(H)
var/obj/item/shield/riot/tact/shield = new(H)
var/obj/item/grenade/flashbang/flashbang = new(H)
var/obj/item/handcuffs/cuffs = new(H)
var/obj/item/device/flash/flash = new(H)
var/obj/item/device/flashlight/flare/flare = new(H)
@@ -222,13 +222,13 @@
head = /obj/item/clothing/head/beret/centcom/commander
backpack_contents = list(
/obj/item/weapon/storage/fancy/cigar = 1,
/obj/item/weapon/flame/lighter/zippo = 1,
/obj/item/storage/fancy/cigar = 1,
/obj/item/flame/lighter/zippo = 1,
/obj/item/clothing/accessory/medal/gold/heroism = 1
)
implants = list(
/obj/item/weapon/implant/loyalty
/obj/item/implant/loyalty
)
/datum/outfit/admin/nt/tcfl_commander
@@ -238,18 +238,18 @@
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/legion
head = /obj/item/clothing/head/legion_beret
belt = /obj/item/weapon/storage/belt/security/tactical
belt = /obj/item/storage/belt/security/tactical
backpack_contents = list(
/obj/item/weapon/gun/projectile/revolver = 1,
/obj/item/gun/projectile/revolver = 1,
/obj/item/clothing/accessory/holster/hip = 1,
/obj/item/clothing/accessory/legion = 1,
/obj/item/weapon/storage/box/flashbangs = 1
/obj/item/storage/box/flashbangs = 1
)
belt_contents = list(
/obj/item/weapon/melee/baton/loaded = 1,
/obj/item/weapon/handcuffs = 2,
/obj/item/melee/baton/loaded = 1,
/obj/item/handcuffs = 2,
/obj/item/ammo_magazine/a357 = 2,
/obj/item/device/flash = 1
)
@@ -264,9 +264,9 @@
l_ear = /obj/item/device/radio/headset/ert/ccia
glasses = /obj/item/clothing/glasses/sunglasses/sechud
head = /obj/item/clothing/head/beret/centcom/officer
l_pocket = /obj/item/weapon/reagent_containers/spray/pepper
l_pocket = /obj/item/reagent_containers/spray/pepper
r_pocket = /obj/item/device/taperecorder/cciaa
l_hand = /obj/item/weapon/storage/lockbox/cciaa
l_hand = /obj/item/storage/lockbox/cciaa
pda = /obj/item/device/pda/central
/datum/outfit/admin/nt/odinsec
@@ -281,23 +281,23 @@
mask = /obj/item/clothing/mask/gas/tactical
head = /obj/item/clothing/head/helmet/swat/peacekeeper
back = null
r_pocket = /obj/item/weapon/handcuffs/ziptie
l_hand = /obj/item/weapon/shield/riot/tact
suit_store = /obj/item/weapon/gun/energy/gun
belt = /obj/item/weapon/storage/belt/security
r_pocket = /obj/item/handcuffs/ziptie
l_hand = /obj/item/shield/riot/tact
suit_store = /obj/item/gun/energy/gun
belt = /obj/item/storage/belt/security
backpack_contents = null
belt_contents = list(
/obj/item/weapon/reagent_containers/spray/pepper = 1,
/obj/item/weapon/melee/baton/loaded = 1,
/obj/item/weapon/grenade/chem_grenade/gas = 1,
/obj/item/reagent_containers/spray/pepper = 1,
/obj/item/melee/baton/loaded = 1,
/obj/item/grenade/chem_grenade/gas = 1,
/obj/item/device/flash = 1,
/obj/item/ammo_magazine/c45x = 2
)
implants = list(
/obj/item/weapon/implant/loyalty
/obj/item/implant/loyalty
)
/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -305,7 +305,7 @@
if(H && H.w_uniform)
var/obj/item/clothing/accessory/holster/hip/holster = new(H)
var/obj/item/weapon/gun/projectile/automatic/x9/weapon = new(H)
var/obj/item/gun/projectile/automatic/x9/weapon = new(H)
holster.contents += weapon
holster.holstered = weapon
var/obj/item/clothing/under/rank/U = H.w_uniform
@@ -322,11 +322,11 @@
glasses = /obj/item/clothing/glasses/eyepatch/hud/thermal
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
head = /obj/item/clothing/head/helmet/space/deathsquad/beret
belt = /obj/item/weapon/gun/energy/pulse/pistol
r_pocket = /obj/item/weapon/flame/lighter/zippo
belt = /obj/item/gun/energy/pulse/pistol
r_pocket = /obj/item/flame/lighter/zippo
implants = list(
/obj/item/weapon/implant/loyalty
/obj/item/implant/loyalty
)
id_access = "Death Commando"
@@ -339,7 +339,7 @@
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/bandana
glasses = /obj/item/clothing/glasses/eyepatch
r_hand = /obj/item/weapon/melee/energy/sword/pirate
r_hand = /obj/item/melee/energy/sword/pirate
/datum/outfit/admin/spacepirate
@@ -350,7 +350,7 @@
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/helmet/space/pirate
glasses = /obj/item/clothing/glasses/eyepatch
r_hand = /obj/item/weapon/melee/energy/sword/pirate
r_hand = /obj/item/melee/energy/sword/pirate
/datum/outfit/admin/sovietsoldier
@@ -369,10 +369,10 @@
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
head = /obj/item/clothing/head/hgpiratecap
belt = /obj/item/weapon/gun/projectile/revolver/mateba
belt = /obj/item/gun/projectile/revolver/mateba
l_ear = /obj/item/device/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch/hud/thermal
id = /obj/item/weapon/card/id
id = /obj/item/card/id
/datum/outfit/admin/sovietsoldier/get_id_assignment()
return "Admiral"
@@ -392,14 +392,14 @@
head = /obj/item/clothing/head/welding
l_ear = /obj/item/device/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
l_pocket = /obj/item/weapon/material/knife
r_pocket = /obj/item/weapon/scalpel
r_hand = /obj/item/weapon/material/twohanded/fireaxe
l_pocket = /obj/item/material/knife
r_pocket = /obj/item/scalpel
r_hand = /obj/item/material/twohanded/fireaxe
id = null
/datum/outfit/admin/maskedkiller/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
for(var/obj/item/carried_item in H.contents)
if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant.
if(!istype(carried_item, /obj/item/implant))//If it's not an implant.
carried_item.add_blood(H)//Oh yes, there will be blood...
@@ -412,21 +412,21 @@
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/device/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/weapon/melee/energy/sword
r_pocket = /obj/item/weapon/cloaking_device
id = /obj/item/weapon/card/id/syndicate
l_pocket = /obj/item/melee/energy/sword
r_pocket = /obj/item/cloaking_device
id = /obj/item/card/id/syndicate
pda = /obj/item/device/pda/heads
/datum/outfit/admin/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(H)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
for(var/obj/item/briefcase_item in sec_briefcase)
qdel(briefcase_item)
for(var/i=3, i>0, i--)
sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
sec_briefcase.contents += new /obj/item/spacecash/c1000
sec_briefcase.contents += new /obj/item/gun/energy/crossbow
sec_briefcase.contents += new /obj/item/gun/projectile/revolver/mateba
sec_briefcase.contents += new /obj/item/ammo_magazine/a357
sec_briefcase.contents += new /obj/item/weapon/plastique
sec_briefcase.contents += new /obj/item/plastique
H.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
/datum/outfit/admin/assassin/get_id_access()
@@ -459,11 +459,11 @@
shoes = "shoe selection"
l_ear = /obj/item/device/radio/headset
back = list(
/obj/item/weapon/storage/backpack,
/obj/item/weapon/storage/backpack/satchel_norm,
/obj/item/weapon/storage/backpack/satchel,
/obj/item/weapon/storage/backpack/duffel,
/obj/item/weapon/storage/backpack/duffel
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/duffel,
/obj/item/storage/backpack/duffel
)
/datum/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -473,8 +473,8 @@
var/path = pick(list(
/obj/item/clothing/mask/smokable/pipe,
/obj/item/clothing/mask/smokable/pipe/cobpipe,
/obj/item/weapon/storage/fancy/cigar,
/obj/item/weapon/storage/fancy/cigarettes
/obj/item/storage/fancy/cigar,
/obj/item/storage/fancy/cigarettes
))
H.equip_or_collect(new path(), slot_wear_mask)
@@ -502,7 +502,7 @@
/datum/outfit/admin/random/visitor
name = "Random Visitor"
id = /obj/item/weapon/card/id
id = /obj/item/card/id
pda = /obj/item/device/pda
/datum/outfit/admin/random/visitor/get_id_assignment()
code/datums/outfits/outfit_antag.dm
+50 -50
View File
@@ -6,22 +6,22 @@
uniform = /obj/item/clothing/under/syndicate
back = null
backpack = /obj/item/weapon/storage/backpack/syndie
satchel = /obj/item/weapon/storage/backpack/satchel_syndie
satchel_alt = /obj/item/weapon/storage/backpack/satchel
dufflebag = /obj/item/weapon/storage/backpack/duffel/syndie
messengerbag = /obj/item/weapon/storage/backpack/messenger/syndie
belt = /obj/item/weapon/storage/belt/utility/full
backpack = /obj/item/storage/backpack/syndie
satchel = /obj/item/storage/backpack/satchel_syndie
satchel_alt = /obj/item/storage/backpack/satchel
dufflebag = /obj/item/storage/backpack/duffel/syndie
messengerbag = /obj/item/storage/backpack/messenger/syndie
belt = /obj/item/storage/belt/utility/full
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/syndicate
id = /obj/item/weapon/card/id/syndicate
id = /obj/item/card/id/syndicate
r_pocket = /obj/item/device/radio/uplink
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1,
/obj/item/storage/box/engineer = 1,
/obj/item/device/flashlight = 1,
/obj/item/weapon/card/emag = 1,
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/card/emag = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/device/multitool = 1
)
@@ -46,23 +46,23 @@
name = "Syndicate Operative"
suit = /obj/item/clothing/suit/space/void/merc
belt = /obj/item/weapon/storage/belt/military/syndicate
belt = /obj/item/storage/belt/military/syndicate
head = /obj/item/clothing/head/helmet/space/void/merc
mask = /obj/item/clothing/mask/gas/syndicate
l_ear = /obj/item/device/radio/headset/syndicate
glasses = /obj/item/clothing/glasses/night
shoes = /obj/item/clothing/shoes/magboots
l_pocket = /obj/item/weapon/pinpointer/nukeop
l_hand = /obj/item/weapon/tank/jetpack/void
l_pocket = /obj/item/pinpointer/nukeop
l_hand = /obj/item/tank/jetpack/void
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1,
/obj/item/weapon/reagent_containers/pill/cyanide = 1,
/obj/item/weapon/gun/projectile/automatic/x9 = 1,
/obj/item/storage/box/engineer = 1,
/obj/item/reagent_containers/pill/cyanide = 1,
/obj/item/gun/projectile/automatic/x9 = 1,
/obj/item/ammo_magazine/c45x = 1,
/obj/item/weapon/crowbar/red = 1,
/obj/item/weapon/plastique = 1,
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/crowbar/red = 1,
/obj/item/plastique = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/device/flashlight = 1,
/obj/item/clothing/shoes/combat = 1
)
@@ -72,22 +72,22 @@
head = /obj/item/clothing/head/beret
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
belt = /obj/item/weapon/gun/projectile/deagle
belt = /obj/item/gun/projectile/deagle
l_ear = /obj/item/device/radio/headset/syndicate
l_pocket = /obj/item/weapon/pinpointer/advpinpointer
l_pocket = /obj/item/pinpointer/advpinpointer
r_pocket = null // stop them getting a radio uplink, they get an implant instead
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1,
/obj/item/storage/box/engineer = 1,
/obj/item/device/flashlight = 1,
/obj/item/weapon/reagent_containers/pill/cyanide = 1,
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/reagent_containers/pill/cyanide = 1,
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1,
/obj/item/ammo_magazine/a50 = 2,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/weapon/flame/lighter/zippo = 1
/obj/item/flame/lighter/zippo = 1
)
implants = list(
/obj/item/weapon/implant/explosive
/obj/item/implant/explosive
)
id_access = "Syndicate Operative Leader"
@@ -99,7 +99,7 @@
id_access = "Syndicate Agent"
implants = list(
/obj/item/weapon/implant/explosive
/obj/item/implant/explosive
)
// Syndicate Auxiliary Outfits (ninja, merc, etc.)
@@ -109,14 +109,14 @@
allow_backbag_choice = FALSE
uniform = /obj/item/clothing/under/syndicate/ninja
back = /obj/item/weapon/rig/light/ninja
belt = /obj/item/weapon/storage/belt/ninja
back = /obj/item/rig/light/ninja
belt = /obj/item/storage/belt/ninja
shoes = /obj/item/clothing/shoes/swat/ert
gloves = /obj/item/clothing/ring/ninja
mask = /obj/item/clothing/mask/balaclava
l_ear = /obj/item/device/radio/headset/ninja
glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical
id = /obj/item/weapon/card/id/syndicate
id = /obj/item/card/id/syndicate
l_pocket = null
r_pocket = null
accessory = /obj/item/clothing/accessory/storage/pouches/black
@@ -125,8 +125,8 @@
belt_contents = list(
/obj/item/device/flashlight/maglight = 1,
/obj/item/weapon/crowbar = 1,
/obj/item/weapon/screwdriver = 1,
/obj/item/crowbar = 1,
/obj/item/screwdriver = 1,
/obj/item/device/paicard = 1
)
@@ -143,13 +143,13 @@
name = "Mercenary"
uniform = /obj/item/clothing/under/syndicate
belt = /obj/item/weapon/storage/belt/military
belt = /obj/item/storage/belt/military
gloves = /obj/item/clothing/gloves/swat
shoes = /obj/item/clothing/shoes/jackboots
backpack_contents = list(
/obj/item/weapon/storage/box/engineer = 1,
/obj/item/weapon/reagent_containers/pill/cyanide = 1
/obj/item/storage/box/engineer = 1,
/obj/item/reagent_containers/pill/cyanide = 1
)
/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -211,7 +211,7 @@
gloves = null
l_ear = /obj/item/device/radio/headset/raider
r_pocket = null
id = /obj/item/weapon/storage/wallet
id = /obj/item/storage/wallet
backpack_contents = list()
@@ -224,8 +224,8 @@
var/fallback_type = pick(/obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/jackboots/unathi)
H.equip_to_slot_or_del(new fallback_type(H), slot_shoes)
var/obj/item/weapon/storage/wallet/W = H.wear_id
var/obj/item/weapon/card/id/syndicate/raider/id = new(H)
var/obj/item/storage/wallet/W = H.wear_id
var/obj/item/card/id/syndicate/raider/id = new(H)
id.name = "[H.real_name]'s Passport"
if(W)
W.handle_item_insertion(id)
@@ -240,17 +240,17 @@
head = /obj/item/clothing/head/beret
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/heads/captain
l_hand = /obj/item/weapon/material/sword
l_pocket = /obj/item/weapon/pinpointer
l_hand = /obj/item/material/sword
l_pocket = /obj/item/pinpointer
id = /obj/item/weapon/card/id/highlander
id = /obj/item/card/id/highlander
/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
var/obj/item/weapon/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id
if(W)
W.name = "[H.real_name]'s ID"
W.registered_name = H.real_name
@@ -261,18 +261,18 @@
uniform = /obj/item/clothing/under/lightpurple
back = null
backpack = /obj/item/weapon/storage/backpack/wizard
satchel = /obj/item/weapon/storage/backpack/satchel_wizard
satchel_alt = /obj/item/weapon/storage/backpack/satchel
dufflebag = /obj/item/weapon/storage/backpack/duffel/wizard
messengerbag = /obj/item/weapon/storage/backpack/messenger/wizard
backpack = /obj/item/storage/backpack/wizard
satchel = /obj/item/storage/backpack/satchel_wizard
satchel_alt = /obj/item/storage/backpack/satchel
dufflebag = /obj/item/storage/backpack/duffel/wizard
messengerbag = /obj/item/storage/backpack/messenger/wizard
suit = /obj/item/clothing/suit/wizrobe
head = /obj/item/clothing/head/wizard
shoes = /obj/item/clothing/shoes/sandal
l_ear = /obj/item/device/radio/headset
r_pocket = /obj/item/weapon/teleportation_scroll
l_hand = /obj/item/weapon/spellbook
r_pocket = /obj/item/teleportation_scroll
l_hand = /obj/item/spellbook
backpack_contents = list(
/obj/item/weapon/storage/box = 1
/obj/item/storage/box = 1
)
code/datums/supplypacks.dm
+283 -283
View File
@@ -31,12 +31,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/specialops
name = "Special Ops supplies"
contains = list(/obj/item/weapon/storage/box/emps,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/pen/reagent/paralysis,
/obj/item/weapon/grenade/chem_grenade/incendiary)
contains = list(/obj/item/storage/box/emps,
/obj/item/grenade/smokebomb,
/obj/item/grenade/smokebomb,
/obj/item/grenade/smokebomb,
/obj/item/pen/reagent/paralysis,
/obj/item/grenade/chem_grenade/incendiary)
cost = 20
containertype = /obj/structure/closet/crate
containername = "crate"
@@ -46,13 +46,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/illegalguns
name = "Illegal weapons crate"
num_contained = 2
contains = list(/obj/item/weapon/gun/projectile/automatic/mini_uzi,
/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/weapon/gun/projectile/revolver/derringer,
/obj/item/weapon/gun/projectile/dragunov,
/obj/item/weapon/gun/energy/retro)
contains = list(/obj/item/gun/projectile/automatic/mini_uzi,
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/gun/projectile/silenced,
/obj/item/gun/projectile/pirate,
/obj/item/gun/projectile/revolver/derringer,
/obj/item/gun/projectile/dragunov,
/obj/item/gun/energy/retro)
cost = 120
containertype = /obj/structure/closet/crate
containername = "crate"
@@ -61,13 +61,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/forensics
name = "Auxiliary forensic tools"
contains = list(/obj/item/weapon/forensics/sample_kit,
/obj/item/weapon/forensics/sample_kit/powder,
/obj/item/weapon/storage/box/swabs,
/obj/item/weapon/storage/box/swabs,
/obj/item/weapon/storage/box/swabs,
/obj/item/weapon/storage/box/slides,
/obj/item/weapon/reagent_containers/spray/luminol,
contains = list(/obj/item/forensics/sample_kit,
/obj/item/forensics/sample_kit/powder,
/obj/item/storage/box/swabs,
/obj/item/storage/box/swabs,
/obj/item/storage/box/swabs,
/obj/item/storage/box/slides,
/obj/item/reagent_containers/spray/luminol,
/obj/item/device/uv_light)
cost = 30
containertype = /obj/structure/closet/crate
@@ -76,21 +76,21 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/food
name = "Kitchen supply crate"
contains = list(/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/peppermill,
/obj/item/weapon/reagent_containers/food/condiment/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/enzyme,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/reagent_containers/food/drinks/soymilk,
/obj/item/weapon/reagent_containers/food/drinks/soymilk,
/obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat)
contains = list(/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/spacespice,
/obj/item/reagent_containers/food/condiment/peppermill,
/obj/item/reagent_containers/food/condiment/saltshaker,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/reagent_containers/food/drinks/soymilk,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat)
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "Food crate"
@@ -98,7 +98,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/monkey
name = "Monkey crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes)
contains = list (/obj/item/storage/box/monkeycubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Monkey crate"
@@ -106,7 +106,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/farwa
name = "Farwa crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes)
contains = list (/obj/item/storage/box/monkeycubes/farwacubes)
cost = 30
containertype = /obj/structure/closet/crate/freezer
containername = "Farwa crate"
@@ -114,7 +114,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/skrell
name = "Neaera crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes)
contains = list (/obj/item/storage/box/monkeycubes/neaeracubes)
cost = 30
containertype = /obj/structure/closet/crate/freezer
containername = "Neaera crate"
@@ -122,7 +122,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/stok
name = "Stok crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes)
contains = list (/obj/item/storage/box/monkeycubes/stokcubes)
cost = 30
containertype = /obj/structure/closet/crate/freezer
containername = "Stok crate"
@@ -153,20 +153,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/party
name = "Party equipment"
contains = list(/obj/item/weapon/storage/box/drinkingglasses,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/weapon/reagent_containers/food/drinks/bottle/sarezhiwine,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer)
contains = list(/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/drinks/flask/barflask,
/obj/item/reagent_containers/food/drinks/bottle/patron,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/bottle/sarezhiwine,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/obj/item/lipstick/random,
/obj/item/reagent_containers/food/drinks/bottle/small/ale,
/obj/item/reagent_containers/food/drinks/bottle/small/ale,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Party equipment"
@@ -174,9 +174,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/lasertag
name = "Lasertag equipment"
contains = list(/obj/item/weapon/gun/energy/lasertag/red,
contains = list(/obj/item/gun/energy/lasertag/red,
/obj/item/clothing/suit/redtag,
/obj/item/weapon/gun/energy/lasertag/blue,
/obj/item/gun/energy/lasertag/blue,
/obj/item/clothing/suit/bluetag)
containertype = /obj/structure/closet
containername = "Lasertag Closet"
@@ -188,9 +188,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/weapon/tank/air,
/obj/item/weapon/tank/air,
/obj/item/weapon/tank/air)
/obj/item/tank/air,
/obj/item/tank/air,
/obj/item/tank/air)
cost = 10
containertype = /obj/structure/closet/crate/internals
containername = "Internals crate"
@@ -198,16 +198,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/evacuation
name = "Emergency equipment"
contains = list(/obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/storage/toolbox/emergency,
contains = list(/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/vest,
/obj/item/weapon/tank/emergency_oxygen/engi,
/obj/item/weapon/tank/emergency_oxygen/engi,
/obj/item/weapon/tank/emergency_oxygen/engi,
/obj/item/weapon/tank/emergency_oxygen/engi,
/obj/item/tank/emergency_oxygen/engi,
/obj/item/tank/emergency_oxygen/engi,
/obj/item/tank/emergency_oxygen/engi,
/obj/item/tank/emergency_oxygen/engi,
/obj/item/clothing/suit/space/emergency,
/obj/item/clothing/suit/space/emergency,
/obj/item/clothing/suit/space/emergency,
@@ -231,9 +231,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/inflatable
name = "Inflatable barriers"
contains = list(/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/weapon/storage/briefcase/inflatable)
contains = list(/obj/item/storage/briefcase/inflatable,
/obj/item/storage/briefcase/inflatable,
/obj/item/storage/briefcase/inflatable)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Inflatable Barrier Crate"
@@ -241,19 +241,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/janitor
name = "Janitorial supplies"
contains = list(/obj/item/weapon/reagent_containers/glass/bucket,
/obj/item/weapon/mop,
/obj/item/weapon/caution,
/obj/item/weapon/caution,
/obj/item/weapon/caution,
/obj/item/weapon/caution,
/obj/item/weapon/storage/bag/trash,
contains = list(/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/item/caution,
/obj/item/caution,
/obj/item/caution,
/obj/item/caution,
/obj/item/storage/bag/trash,
/obj/item/device/lightreplacer,
/obj/item/weapon/reagent_containers/spray/cleaner,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/weapon/grenade/chem_grenade/cleaner,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/glass/rag,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/structure/mopbucket)
cost = 10
containertype = /obj/structure/closet/crate
@@ -262,9 +262,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/lightbulbs
name = "Replacement lights"
contains = list(/obj/item/weapon/storage/box/lights/mixed,
/obj/item/weapon/storage/box/lights/mixed,
/obj/item/weapon/storage/box/lights/mixed)
contains = list(/obj/item/storage/box/lights/mixed,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/box/lights/mixed)
cost = 10
containertype = /obj/structure/closet/crate
containername = "Replacement lights"
@@ -272,7 +272,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/wizard
name = "Wizard costume"
contains = list(/obj/item/weapon/staff,
contains = list(/obj/item/staff,
/obj/item/clothing/suit/wizrobe/fake,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/head/wizard/fake)
@@ -315,19 +315,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/hydroponics // -- Skie
name = "Hydroponics Supply Crate"
contains = list(/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/glass/bottle/ammonia,
/obj/item/weapon/reagent_containers/glass/bottle/ammonia,
/obj/item/weapon/material/hatchet,
/obj/item/weapon/material/minihoe,
contains = list(/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/glass/bottle/ammonia,
/obj/item/reagent_containers/glass/bottle/ammonia,
/obj/item/material/hatchet,
/obj/item/material/minihoe,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/suit/apron,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/storage/box/botanydisk
/obj/item/material/minihoe,
/obj/item/storage/box/botanydisk
) // Updated with new things
cost = 15
containertype = /obj/structure/closet/crate/hydroponics
@@ -387,16 +387,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/weedcontrol
name = "Weed control crate"
contains = list(/obj/item/weapon/material/hatchet,
/obj/item/weapon/material/hatchet,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/plantbgone,
contains = list(/obj/item/material/hatchet,
/obj/item/material/hatchet,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/weapon/grenade/chem_grenade/antiweed,
/obj/item/weapon/grenade/chem_grenade/antiweed)
/obj/item/grenade/chem_grenade/antiweed,
/obj/item/grenade/chem_grenade/antiweed)
cost = 25
containertype = /obj/structure/closet/crate/hydroponics
containername = "Weed control crate"
@@ -424,16 +424,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medical
name = "Medical crate"
contains = list(/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/storage/firstaid/fire,
/obj/item/weapon/storage/firstaid/toxin,
/obj/item/weapon/storage/firstaid/o2,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/storage/box/autoinjectors)
contains = list(/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/adv,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/storage/box/syringes,
/obj/item/storage/box/autoinjectors)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "Medical crate"
@@ -441,9 +441,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bloodpack
name = "BloodPack crate"
contains = list(/obj/item/weapon/storage/box/bloodpacks,
/obj/item/weapon/storage/box/bloodpacks,
/obj/item/weapon/storage/box/bloodpacks)
contains = list(/obj/item/storage/box/bloodpacks,
/obj/item/storage/box/bloodpacks,
/obj/item/storage/box/bloodpacks)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "BloodPack crate"
@@ -451,9 +451,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bodybag
name = "Body bag crate"
contains = list(/obj/item/weapon/storage/box/bodybags,
/obj/item/weapon/storage/box/bodybags,
/obj/item/weapon/storage/box/bodybags)
contains = list(/obj/item/storage/box/bodybags,
/obj/item/storage/box/bodybags,
/obj/item/storage/box/bodybags)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "Body bag crate"
@@ -471,22 +471,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/virus
name = "Virus sample crate"
/* contains = list(/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
/obj/item/weapon/reagent_containers/glass/bottle/cold,
/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion,
/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs,
/obj/item/weapon/reagent_containers/glass/bottle/magnitis,
/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
/obj/item/weapon/reagent_containers/glass/bottle/brainrot,
/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/storage/box/beakers,
/obj/item/weapon/reagent_containers/glass/bottle/mutagen)*/
contains = list(/obj/item/weapon/virusdish/random,
/obj/item/weapon/virusdish/random,
/obj/item/weapon/virusdish/random,
/obj/item/weapon/virusdish/random)
/* contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion,
/obj/item/reagent_containers/glass/bottle/cold,
/obj/item/reagent_containers/glass/bottle/epiglottis_virion,
/obj/item/reagent_containers/glass/bottle/liver_enhance_virion,
/obj/item/reagent_containers/glass/bottle/fake_gbs,
/obj/item/reagent_containers/glass/bottle/magnitis,
/obj/item/reagent_containers/glass/bottle/pierrot_throat,
/obj/item/reagent_containers/glass/bottle/brainrot,
/obj/item/reagent_containers/glass/bottle/hullucigen_virion,
/obj/item/storage/box/syringes,
/obj/item/storage/box/beakers,
/obj/item/reagent_containers/glass/bottle/mutagen)*/
contains = list(/obj/item/virusdish/random,
/obj/item/virusdish/random,
/obj/item/virusdish/random,
/obj/item/virusdish/random)
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Virus sample crate"
@@ -540,7 +540,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/smescoil
name = "Superconducting Magnetic Coil"
contains = list(/obj/item/weapon/smes_coil)
contains = list(/obj/item/smes_coil)
cost = 75
containertype = /obj/structure/closet/crate
containername = "Superconducting Magnetic Coil crate"
@@ -548,14 +548,14 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/electrical
name = "Electrical maintenance crate"
contains = list(/obj/item/weapon/storage/toolbox/electrical,
/obj/item/weapon/storage/toolbox/electrical,
contains = list(/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/gloves/yellow,
/obj/item/weapon/cell,
/obj/item/weapon/cell,
/obj/item/weapon/cell/high,
/obj/item/weapon/cell/high)
/obj/item/cell,
/obj/item/cell,
/obj/item/cell/high,
/obj/item/cell/high)
cost = 15
containertype = /obj/structure/closet/crate
containername = "Electrical maintenance crate"
@@ -563,9 +563,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mechanical
name = "Mechanical maintenance crate"
contains = list(/obj/item/weapon/storage/belt/utility/full,
/obj/item/weapon/storage/belt/utility/full,
/obj/item/weapon/storage/belt/utility/full,
contains = list(/obj/item/storage/belt/utility/full,
/obj/item/storage/belt/utility/full,
/obj/item/storage/belt/utility/full,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
@@ -624,9 +624,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller,
/obj/item/weapon/circuitboard/solar_control,
/obj/item/weapon/tracker_electronics,
/obj/item/weapon/paper/solar)
/obj/item/circuitboard/solar_control,
/obj/item/tracker_electronics,
/obj/item/paper/solar)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Solar pack crate"
@@ -684,9 +684,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
contains = list(/obj/item/weapon/book/manual/ripley_build_and_repair,
/obj/item/weapon/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer,
/obj/item/weapon/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer
contains = list(/obj/item/book/manual/ripley_build_and_repair,
/obj/item/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer,
/obj/item/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer
cost = 30
containertype = /obj/structure/closet/crate/secure
containername = "APLU \"Ripley\" Circuit Crate"
@@ -695,8 +695,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")"
contains = list(/obj/item/weapon/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer,
/obj/item/weapon/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer
contains = list(/obj/item/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer,
/obj/item/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "\"Odysseus\" Circuit Crate"
@@ -716,13 +716,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/item/device/assembly/prox_sensor,
/obj/item/device/assembly/prox_sensor,
/obj/item/device/assembly/prox_sensor,
/obj/item/weapon/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
/obj/item/device/flash,
/obj/item/device/flash,
/obj/item/device/flash,
/obj/item/device/flash,
/obj/item/weapon/cell/high,
/obj/item/weapon/cell/high)
/obj/item/cell/high,
/obj/item/cell/high)
cost = 10
containertype = /obj/structure/closet/crate/secure/gear
containername = "Robotics assembly"
@@ -731,9 +731,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/phoron
name = "Phoron assembly crate"
contains = list(/obj/item/weapon/tank/phoron,
/obj/item/weapon/tank/phoron,
/obj/item/weapon/tank/phoron,
contains = list(/obj/item/tank/phoron,
/obj/item/tank/phoron,
/obj/item/tank/phoron,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
/obj/item/device/assembly/igniter,
@@ -751,10 +751,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/weapons
name = "Weapons crate"
contains = list(/obj/item/weapon/gun/energy/rifle/laser,
/obj/item/weapon/gun/energy/rifle/laser,
/obj/item/weapon/gun/projectile/sec,
/obj/item/weapon/gun/projectile/sec,
contains = list(/obj/item/gun/energy/rifle/laser,
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/projectile/sec,
/obj/item/gun/projectile/sec,
/obj/item/ammo_magazine/c45m,
/obj/item/ammo_magazine/c45m)
cost = 80
@@ -765,14 +765,14 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/nonlethals
name = "Nonlethal Weapons crate"
contains = list(/obj/item/weapon/melee/baton,
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/box/flashbangs,
contains = list(/obj/item/melee/baton,
/obj/item/melee/baton,
/obj/item/gun/energy/taser,
/obj/item/gun/energy/taser,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/flashbangs,
/obj/item/ammo_magazine/tranq,
/obj/item/weapon/storage/box/zipties)
/obj/item/storage/box/zipties)
cost = 60
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Weapons crate"
@@ -781,10 +781,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/flareguns
name = "Flare guns crate"
contains = list(/obj/item/weapon/gun/projectile/sec/flash,
contains = list(/obj/item/gun/projectile/sec/flash,
/obj/item/ammo_magazine/c45m/flash,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/weapon/storage/box/flashshells)
/obj/item/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/storage/box/flashshells)
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Flare gun crate"
@@ -812,25 +812,25 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/riot
name = "Riot gear crate"
contains = list(/obj/item/weapon/melee/baton,
/obj/item/weapon/melee/baton,
/obj/item/weapon/melee/baton,
/obj/item/weapon/shield/riot,
/obj/item/weapon/shield/riot,
/obj/item/weapon/shield/riot,
/obj/item/weapon/handcuffs,
/obj/item/weapon/handcuffs,
/obj/item/weapon/handcuffs,
contains = list(/obj/item/melee/baton,
/obj/item/melee/baton,
/obj/item/melee/baton,
/obj/item/shield/riot,
/obj/item/shield/riot,
/obj/item/shield/riot,
/obj/item/handcuffs,
/obj/item/handcuffs,
/obj/item/handcuffs,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/box/teargas,
/obj/item/weapon/storage/box/beanbags,
/obj/item/weapon/storage/box/handcuffs)
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/handcuffs)
cost = 60
containertype = /obj/structure/closet/crate/secure
containername = "Riot gear crate"
@@ -839,9 +839,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/energyweapons
name = "Energy weapons crate"
contains = list(/obj/item/weapon/gun/energy/rifle/laser,
/obj/item/weapon/gun/energy/rifle/laser,
/obj/item/weapon/gun/energy/rifle/laser)
contains = list(/obj/item/gun/energy/rifle/laser,
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/energy/rifle/laser)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "energy weapons crate"
@@ -854,8 +854,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/head/helmet/ballistic,
/obj/item/ammo_magazine/shotgun,
/obj/item/ammo_magazine/shotgun/shell,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/gun/projectile/shotgun/pump/combat)
/obj/item/gun/projectile/shotgun/pump/combat,
/obj/item/gun/projectile/shotgun/pump/combat)
cost = 65
containertype = /obj/structure/closet/crate/secure
containername = "Shotgun crate"
@@ -866,8 +866,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
name = "Energy marksman crate"
contains = list(/obj/item/clothing/suit/armor/laserproof,
/obj/item/clothing/head/helmet/ablative,
/obj/item/weapon/gun/energy/sniperrifle,
/obj/item/weapon/gun/energy/sniperrifle)
/obj/item/gun/energy/sniperrifle,
/obj/item/gun/energy/sniperrifle)
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Energy marksman crate"
@@ -889,10 +889,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/ionweapons
name = "Electromagnetic weapons crate"
contains = list(/obj/item/weapon/gun/energy/ionrifle,
/obj/item/weapon/gun/energy/ionrifle,
contains = list(/obj/item/gun/energy/ionrifle,
/obj/item/gun/energy/ionrifle,
/obj/item/ammo_magazine/shotgun/emp,
/obj/item/weapon/storage/box/emps)
/obj/item/storage/box/emps)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "electromagnetic weapons crate"
@@ -902,8 +902,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/automatic
name = "Automatic weapon crate"
num_contained = 2
contains = list(/obj/item/weapon/gun/projectile/automatic/wt550,
/obj/item/weapon/gun/projectile/automatic/rifle/z8)
contains = list(/obj/item/gun/projectile/automatic/wt550,
/obj/item/gun/projectile/automatic/rifle/z8)
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Automatic weapon crate"
@@ -925,7 +925,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/*
/datum/supply_packs/loyalty
name = "Loyalty implant crate"
contains = list (/obj/item/weapon/storage/lockbox/loyalty)
contains = list (/obj/item/storage/lockbox/loyalty)
cost = 60
containertype = /obj/structure/closet/crate/secure
containername = "Loyalty implant crate"
@@ -937,8 +937,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
name = "Experimental energy gear crate"
contains = list(/obj/item/clothing/suit/armor/laserproof,
/obj/item/clothing/head/helmet/ablative,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/gun)
/obj/item/gun/energy/gun,
/obj/item/gun/energy/gun)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "Experimental energy gear crate"
@@ -1016,23 +1016,23 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/artscrafts
name = "Arts and Crafts supplies"
contains = list(/obj/item/weapon/storage/fancy/crayons,
contains = list(/obj/item/storage/fancy/crayons,
/obj/item/device/camera,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/weapon/storage/photo_album,
/obj/item/weapon/packageWrap,
/obj/item/weapon/reagent_containers/glass/paint/red,
/obj/item/weapon/reagent_containers/glass/paint/green,
/obj/item/weapon/reagent_containers/glass/paint/blue,
/obj/item/weapon/reagent_containers/glass/paint/yellow,
/obj/item/weapon/reagent_containers/glass/paint/purple,
/obj/item/weapon/reagent_containers/glass/paint/black,
/obj/item/weapon/reagent_containers/glass/paint/white,
/obj/item/weapon/contraband/poster,
/obj/item/weapon/wrapping_paper,
/obj/item/weapon/wrapping_paper,
/obj/item/weapon/wrapping_paper)
/obj/item/storage/photo_album,
/obj/item/packageWrap,
/obj/item/reagent_containers/glass/paint/red,
/obj/item/reagent_containers/glass/paint/green,
/obj/item/reagent_containers/glass/paint/blue,
/obj/item/reagent_containers/glass/paint/yellow,
/obj/item/reagent_containers/glass/paint/purple,
/obj/item/reagent_containers/glass/paint/black,
/obj/item/reagent_containers/glass/paint/white,
/obj/item/contraband/poster,
/obj/item/wrapping_paper,
/obj/item/wrapping_paper,
/obj/item/wrapping_paper)
cost = 10
containertype = "/obj/structure/closet/crate"
containername = "Arts and Crafts crate"
@@ -1042,9 +1042,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/contraband
num_contained = 5
contains = list(/obj/item/seeds/bloodtomatoseed,
/obj/item/weapon/storage/pill_bottle/zoom,
/obj/item/weapon/storage/pill_bottle/happy,
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine)
/obj/item/storage/pill_bottle/zoom,
/obj/item/storage/pill_bottle/happy,
/obj/item/reagent_containers/food/drinks/bottle/pwine)
name = "Contraband crate"
cost = 30
@@ -1055,16 +1055,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/boxes
name = "Empty boxes"
contains = list(/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box,
/obj/item/weapon/storage/box)
contains = list(/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/storage/box)
cost = 10
containertype = "/obj/structure/closet/crate"
containername = "Empty box crate"
@@ -1072,17 +1072,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/surgery
name = "Surgery crate"
contains = list(/obj/item/weapon/cautery,
/obj/item/weapon/surgicaldrill,
contains = list(/obj/item/cautery,
/obj/item/surgicaldrill,
/obj/item/clothing/mask/breath/medical,
/obj/item/weapon/tank/anesthetic,
/obj/item/weapon/FixOVein,
/obj/item/weapon/hemostat,
/obj/item/weapon/scalpel,
/obj/item/weapon/bonegel,
/obj/item/weapon/retractor,
/obj/item/weapon/bonesetter,
/obj/item/weapon/circular_saw)
/obj/item/tank/anesthetic,
/obj/item/FixOVein,
/obj/item/hemostat,
/obj/item/scalpel,
/obj/item/bonegel,
/obj/item/retractor,
/obj/item/bonesetter,
/obj/item/circular_saw)
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Surgery crate"
@@ -1095,11 +1095,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/under/rank/medical/green,
/obj/item/clothing/head/surgery/green,
/obj/item/clothing/head/surgery/green,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves,
/obj/item/weapon/storage/belt/medical,
/obj/item/weapon/storage/belt/medical,
/obj/item/weapon/storage/belt/medical)
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical)
cost = 15
containertype = "/obj/structure/closet/crate"
containername = "Sterile equipment crate"
@@ -1190,9 +1190,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/card_packs
num_contained = 5
contains = list(/obj/item/weapon/pack/cardemon,
/obj/item/weapon/pack/spaceball,
/obj/item/weapon/deck/holder)
contains = list(/obj/item/pack/cardemon,
/obj/item/pack/spaceball,
/obj/item/deck/holder)
name = "Trading Card Crate"
cost = 20
containertype = /obj/structure/closet/crate
@@ -1200,7 +1200,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Miscellaneous"
/datum/supply_packs/shield_gen
contains = list(/obj/item/weapon/circuitboard/shield_gen)
contains = list(/obj/item/circuitboard/shield_gen)
name = "Bubble shield generator circuitry"
cost = 50
containertype = /obj/structure/closet/crate/secure
@@ -1209,7 +1209,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_ce
/datum/supply_packs/shield_gen_ex
contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
contains = list(/obj/item/circuitboard/shield_gen_ex)
name = "Hull shield generator circuitry"
cost = 50
containertype = /obj/structure/closet/crate/secure
@@ -1218,7 +1218,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_ce
/datum/supply_packs/shield_cap
contains = list(/obj/item/weapon/circuitboard/shield_cap)
contains = list(/obj/item/circuitboard/shield_cap)
name = "Bubble shield capacitor circuitry"
cost = 50
containertype = /obj/structure/closet/crate/secure
@@ -1292,9 +1292,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bee_keeper
name = "Beekeeping crate"
contains = list(/obj/item/beehive_assembly,
/obj/item/weapon/bee_smoker,
/obj/item/weapon/bee_net,
/obj/item/weapon/bee_net,
/obj/item/bee_smoker,
/obj/item/bee_net,
/obj/item/bee_net,
/obj/item/clothing/suit/bio_suit/general,//beekeeping suit
/obj/item/clothing/head/bio_hood/general,
/obj/item/honey_frame,
@@ -1304,7 +1304,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/honey_frame,
/obj/item/bee_pack,
/obj/machinery/honey_extractor,
/obj/item/weapon/book/manual/hydroponics_beekeeping)
/obj/item/book/manual/hydroponics_beekeeping)
cost = 40
containertype = /obj/structure/largecrate
containername = "Beekeeping crate"
@@ -1347,19 +1347,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Miscellaneous"
/datum/supply_packs/bureaucracy
contains = list(/obj/item/weapon/clipboard,
/obj/item/weapon/clipboard,
/obj/item/weapon/pen/red,
/obj/item/weapon/pen/blue,
/obj/item/weapon/pen/blue,
contains = list(/obj/item/clipboard,
/obj/item/clipboard,
/obj/item/pen/red,
/obj/item/pen/blue,
/obj/item/pen/blue,
/obj/item/device/camera_film,
/obj/item/weapon/folder/blue,
/obj/item/weapon/folder/red,
/obj/item/weapon/folder/yellow,
/obj/item/weapon/hand_labeler,
/obj/item/weapon/tape_roll,
/obj/item/folder/blue,
/obj/item/folder/red,
/obj/item/folder/yellow,
/obj/item/hand_labeler,
/obj/item/tape_roll,
/obj/structure/filingcabinet/chestdrawer{anchored = 0},
/obj/item/weapon/paper_bin)
/obj/item/paper_bin)
name = "Office supplies"
cost = 15
containertype = /obj/structure/closet/crate
@@ -1391,7 +1391,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical,
/obj/item/storage/belt/security/tactical,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/tactical,
@@ -1399,7 +1399,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical,
/obj/item/storage/belt/security/tactical,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/gloves/black)
@@ -1487,10 +1487,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet/crate/secure
group = "Engineering"
access = access_tech_storage
contains = list(/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/circuitboard/pacman)
contains = list(/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/circuitboard/pacman)
/datum/supply_packs/super_pacman_parts
name = "Super P.A.C.M.A.N. portable generator parts"
@@ -1499,10 +1499,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet/crate/secure
group = "Engineering"
access = access_tech_storage
contains = list(/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/circuitboard/pacman/super)
contains = list(/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/circuitboard/pacman/super)
/datum/supply_packs/witch
name = "Witch costume"
@@ -1512,7 +1512,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/item/clothing/suit/wizrobe/marisa/fake,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/head/wizard/marisa/fake,
/obj/item/weapon/staff/broom)
/obj/item/staff/broom)
group = "Miscellaneous"
/datum/supply_packs/randomised/costume_hats
@@ -1592,12 +1592,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "emergency bluespace relay assembly kit"
containertype = /obj/structure/closet/crate
group = "Engineering"
contains = list(/obj/item/weapon/circuitboard/bluespacerelay,
/obj/item/weapon/stock_parts/manipulator,
/obj/item/weapon/stock_parts/manipulator,
/obj/item/weapon/stock_parts/subspace/filter,
/obj/item/weapon/stock_parts/subspace/crystal,
/obj/item/weapon/storage/toolbox/electrical)
contains = list(/obj/item/circuitboard/bluespacerelay,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/subspace/filter,
/obj/item/stock_parts/subspace/crystal,
/obj/item/storage/toolbox/electrical)
/datum/supply_packs/randomised/exosuit_mod
num_contained = 1
@@ -1737,9 +1737,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/ipc_tag_pack
name = "IPC/Shell Tag Implanter Crate"
contains = list(/obj/item/weapon/implanter/ipc_tag,
/obj/item/weapon/implanter/ipc_tag,
/obj/item/weapon/implanter/ipc_tag
contains = list(/obj/item/implanter/ipc_tag,
/obj/item/implanter/ipc_tag,
/obj/item/implanter/ipc_tag
)
cost = 40
containertype = /obj/structure/closet/crate
@@ -1779,7 +1779,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/ame_fuel
name = "Antimatter Reactor Fuel"
contains = list(
/obj/item/weapon/am_containment
/obj/item/am_containment
)
cost = 20
containertype = /obj/structure/closet/crate/secure/bin
code/datums/trading/ai.dm
+49 -49
View File
@@ -75,30 +75,30 @@ They sell generic supplies and ask for generic supplies.
)
possible_trading_items = list(
/obj/item/weapon/storage/bag = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/storage/bag/ore/drone = TRADER_BLACKLIST, // don't want drone bags
/obj/item/weapon/storage/bag/sheetsnatcher/borg = TRADER_BLACKLIST, // don't want borg bags
/obj/item/weapon/storage/bag/circuits = TRADER_BLACKLIST_ALL, //can spawn glitchy circuit boxes, circuitry should belong to science
/obj/item/weapon/storage/bag/cash = TRADER_BLACKLIST, // spawns with money
/obj/item/weapon/storage/backpack = TRADER_ALL,
/obj/item/weapon/storage/backpack/cultpack = TRADER_BLACKLIST, // cult stuff
/obj/item/weapon/storage/backpack/holding = TRADER_BLACKLIST_ALL, // research stuff
/obj/item/weapon/storage/backpack/satchel/withwallet = TRADER_BLACKLIST, // money inside
/obj/item/weapon/storage/backpack/chameleon = TRADER_BLACKLIST, // traitor stuff
/obj/item/weapon/storage/backpack/typec = TRADER_BLACKLIST_ALL, // Vaurca-exclusive stuff
/obj/item/weapon/storage/backpack/fluff = TRADER_BLACKLIST_ALL, // Custom items, let's not
/obj/item/weapon/storage/belt/champion = TRADER_THIS_TYPE,
/obj/item/weapon/storage/briefcase = TRADER_THIS_TYPE,
/obj/item/weapon/storage/fancy = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/storage/laundry_basket = TRADER_THIS_TYPE,
/obj/item/weapon/storage/secure/briefcase = TRADER_THIS_TYPE,
/obj/item/weapon/storage/bag/plants = TRADER_THIS_TYPE,
/obj/item/weapon/storage/bag/ore = TRADER_THIS_TYPE,
/obj/item/weapon/storage/toolbox = TRADER_ALL,
/obj/item/weapon/storage/toolbox/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/weapon/storage/wallet = TRADER_THIS_TYPE,
/obj/item/weapon/storage/wallet/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/weapon/storage/photo_album = TRADER_THIS_TYPE,
/obj/item/storage/bag = TRADER_SUBTYPES_ONLY,
/obj/item/storage/bag/ore/drone = TRADER_BLACKLIST, // don't want drone bags
/obj/item/storage/bag/sheetsnatcher/borg = TRADER_BLACKLIST, // don't want borg bags
/obj/item/storage/bag/circuits = TRADER_BLACKLIST_ALL, //can spawn glitchy circuit boxes, circuitry should belong to science
/obj/item/storage/bag/cash = TRADER_BLACKLIST, // spawns with money
/obj/item/storage/backpack = TRADER_ALL,
/obj/item/storage/backpack/cultpack = TRADER_BLACKLIST, // cult stuff
/obj/item/storage/backpack/holding = TRADER_BLACKLIST_ALL, // research stuff
/obj/item/storage/backpack/satchel/withwallet = TRADER_BLACKLIST, // money inside
/obj/item/storage/backpack/chameleon = TRADER_BLACKLIST, // traitor stuff
/obj/item/storage/backpack/typec = TRADER_BLACKLIST_ALL, // Vaurca-exclusive stuff
/obj/item/storage/backpack/fluff = TRADER_BLACKLIST_ALL, // Custom items, let's not
/obj/item/storage/belt/champion = TRADER_THIS_TYPE,
/obj/item/storage/briefcase = TRADER_THIS_TYPE,
/obj/item/storage/fancy = TRADER_SUBTYPES_ONLY,
/obj/item/storage/laundry_basket = TRADER_THIS_TYPE,
/obj/item/storage/secure/briefcase = TRADER_THIS_TYPE,
/obj/item/storage/bag/plants = TRADER_THIS_TYPE,
/obj/item/storage/bag/ore = TRADER_THIS_TYPE,
/obj/item/storage/toolbox = TRADER_ALL,
/obj/item/storage/toolbox/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/storage/wallet = TRADER_THIS_TYPE,
/obj/item/storage/wallet/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/storage/photo_album = TRADER_THIS_TYPE,
/obj/item/clothing/glasses = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/glasses/threedglasses/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/clothing/glasses/hud = TRADER_BLACKLIST_ALL, //don't want mech/advanced stuff
@@ -145,8 +145,8 @@ They sell generic supplies and ask for generic supplies.
/obj/structure/ore_box = TRADER_THIS_TYPE,
/obj/structure/dispenser = TRADER_THIS_TYPE,
/obj/mecha/working/hoverpod = TRADER_THIS_TYPE,
/obj/item/weapon/ladder_mobile = TRADER_THIS_TYPE,
/obj/item/weapon/inflatable_dispenser = TRADER_THIS_TYPE,
/obj/item/ladder_mobile = TRADER_THIS_TYPE,
/obj/item/inflatable_dispenser = TRADER_THIS_TYPE,
/obj/machinery/pipedispenser/orderable = TRADER_THIS_TYPE,
/obj/machinery/pipedispenser/disposal/orderable = TRADER_THIS_TYPE,
/obj/structure/reagent_dispensers/water_cooler = TRADER_THIS_TYPE,
@@ -159,35 +159,35 @@ They sell generic supplies and ask for generic supplies.
origin = "Medical Beacon"
possible_trading_items = list(
/obj/item/weapon/storage/firstaid = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/storage/pill_bottle = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/hypospray = TRADER_ALL,
/obj/item/storage/firstaid = TRADER_SUBTYPES_ONLY,
/obj/item/storage/pill_bottle = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/hypospray = TRADER_ALL,
/obj/item/device/healthanalyzer = TRADER_THIS_TYPE,
/obj/item/device/breath_analyzer = TRADER_THIS_TYPE,
/obj/item/stack/medical/bruise_pack = TRADER_THIS_TYPE,
/obj/item/stack/medical/ointment = TRADER_THIS_TYPE,
/obj/item/stack/medical/advanced = TRADER_SUBTYPES_ONLY,
/obj/item/stack/medical/splint = TRADER_THIS_TYPE,
/obj/item/weapon/bonesetter = TRADER_THIS_TYPE,
/obj/item/weapon/retractor = TRADER_THIS_TYPE,
/obj/item/weapon/hemostat = TRADER_THIS_TYPE,
/obj/item/weapon/cautery = TRADER_THIS_TYPE,
/obj/item/weapon/surgicaldrill = TRADER_THIS_TYPE,
/obj/item/weapon/scalpel = TRADER_ALL,
/obj/item/weapon/circular_saw = TRADER_THIS_TYPE,
/obj/item/weapon/bonegel = TRADER_THIS_TYPE,
/obj/item/weapon/FixOVein = TRADER_THIS_TYPE,
/obj/item/weapon/bonesetter = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/syringes = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/syringegun = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/masks = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/gloves = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/cdeathalarm_kit = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/beakers = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE,
/obj/item/bonesetter = TRADER_THIS_TYPE,
/obj/item/retractor = TRADER_THIS_TYPE,
/obj/item/hemostat = TRADER_THIS_TYPE,
/obj/item/cautery = TRADER_THIS_TYPE,
/obj/item/surgicaldrill = TRADER_THIS_TYPE,
/obj/item/scalpel = TRADER_ALL,
/obj/item/circular_saw = TRADER_THIS_TYPE,
/obj/item/bonegel = TRADER_THIS_TYPE,
/obj/item/FixOVein = TRADER_THIS_TYPE,
/obj/item/bonesetter = TRADER_THIS_TYPE,
/obj/item/storage/box/syringes = TRADER_THIS_TYPE,
/obj/item/storage/box/syringegun = TRADER_THIS_TYPE,
/obj/item/storage/box/masks = TRADER_THIS_TYPE,
/obj/item/storage/box/gloves = TRADER_THIS_TYPE,
/obj/item/storage/box/cdeathalarm_kit = TRADER_THIS_TYPE,
/obj/item/storage/box/beakers = TRADER_THIS_TYPE,
/obj/item/reagent_containers/glass/bottle/inaprovaline = TRADER_THIS_TYPE,
/obj/item/reagent_containers/glass/bottle/stoxin = TRADER_THIS_TYPE,
/obj/item/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE,
/obj/item/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE,
/obj/item/device/handheld_medical = TRADER_THIS_TYPE,
/obj/item/stack/medical/advanced/bruise_pack/spaceklot = TRADER_THIS_TYPE,
/obj/mecha/medical/odysseus = TRADER_THIS_TYPE
code/datums/trading/food.dm
+52 -52
View File
@@ -6,13 +6,13 @@
trade_flags = TRADER_GOODS|TRADER_MONEY|TRADER_WANTED_ONLY
possible_wanted_items = list(
/obj/item/weapon/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/weapon/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/weapon/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
/obj/item/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
)
possible_trading_items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza = TRADER_SUBTYPES_ONLY
/obj/item/reagent_containers/food/snacks/sliceable/pizza = TRADER_SUBTYPES_ONLY
)
speech = list(
@@ -47,25 +47,25 @@
trade_flags = TRADER_GOODS|TRADER_MONEY|TRADER_WANTED_ONLY
possible_wanted_items = list(
/obj/item/weapon/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/weapon/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/weapon/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
/obj/item/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
)
possible_trading_items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/ricepudding = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/soydope = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/bibimbap = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/lomein = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/friedrice = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/pisanggoreng = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/chickenmomo = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/veggiemomo = TRADER_THIS_TYPE
/obj/item/reagent_containers/food/snacks/monkeykabob = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/monkeysdelight = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/ricepudding = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/soydope = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/stewedsoymeat = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/wingfangchu = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/drinks/dry_ramen = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/bibimbap = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/lomein = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/friedrice = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/pisanggoreng = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/chickenmomo = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/veggiemomo = TRADER_THIS_TYPE
)
var/list/fortunes = list(
@@ -101,8 +101,8 @@
/datum/trader/chinese/trade(var/list/offers, var/num, var/turf/location)
. = ..()
if(.)
var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/cookie = new(location)
var/obj/item/weapon/paper/paper = new(cookie)
var/obj/item/reagent_containers/food/snacks/fortunecookie/cookie = new(location)
var/obj/item/paper/paper = new(cookie)
cookie.trash = paper
paper.name = "Fortune"
paper.info = pick(fortunes)
@@ -114,17 +114,17 @@
trade_flags = TRADER_MONEY
possible_trading_items = list(
/obj/item/weapon/reagent_containers/food/snacks = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/food/drinks/cans = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/food/drinks/bottle = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/fruit_slice = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/grown = TRADER_BLACKLIST_ALL,
/obj/item/weapon/reagent_containers/food/snacks/human = TRADER_BLACKLIST_ALL,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/meat/human = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/variable = TRADER_BLACKLIST_ALL
/obj/item/reagent_containers/food/snacks = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/food/drinks/cans = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/food/drinks/bottle = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/food/drinks/bottle/small = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/boiledslimecore = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/fruit_slice = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/grown = TRADER_BLACKLIST_ALL,
/obj/item/reagent_containers/food/snacks/human = TRADER_BLACKLIST_ALL,
/obj/item/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/meat/human = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/variable = TRADER_BLACKLIST_ALL
)
speech = list(
@@ -165,26 +165,26 @@
"bribe_refusal" = "Oh ho ho! I'd never think of taking ORIGIN on the road!"
)
possible_wanted_items = list(
/obj/item/weapon/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/weapon/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/weapon/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
/obj/item/material/kitchen/utensil = TRADER_SUBTYPES_ONLY, // Customers keep stealing their cutlery
/obj/item/material/kitchen/utensil/fork/fluff = TRADER_BLACKLIST_ALL, // No custom items
/obj/item/material/kitchen/utensil/knife/boot = TRADER_BLACKLIST // No boot knifes
)
possible_trading_items = list(
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/carrot/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/cheese/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lemon/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/lime/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/orange/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice/filled = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/sliceable = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza = TRADER_BLACKLIST_ALL,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST,
/obj/item/weapon/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/applepie = TRADER_THIS_TYPE
/obj/item/reagent_containers/food/snacks/cakeslice/birthday/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/carrot/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/cheese/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/chocolate/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/lemon/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/lime/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/orange/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/cakeslice/plain/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/pumpkinpieslice/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/bananabreadslice/filled = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/sliceable = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/food/snacks/sliceable/pizza = TRADER_BLACKLIST_ALL,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST,
/obj/item/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/applepie = TRADER_THIS_TYPE
)
code/datums/trading/goods.dm
+50 -50
View File
@@ -36,14 +36,14 @@
/obj/item/toy/katana = TRADER_THIS_TYPE,
/obj/item/toy/sword = TRADER_THIS_TYPE,
/obj/item/toy/bosunwhistle = TRADER_THIS_TYPE,
/obj/item/weapon/board = TRADER_THIS_TYPE,
/obj/item/weapon/deck = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/deck/tarot/fluff = TRADER_BLACKLIST_ALL,
/obj/item/weapon/pack = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/dice = TRADER_ALL,
/obj/item/board = TRADER_THIS_TYPE,
/obj/item/deck = TRADER_SUBTYPES_ONLY,
/obj/item/deck/tarot/fluff = TRADER_BLACKLIST_ALL,
/obj/item/pack = TRADER_SUBTYPES_ONLY,
/obj/item/dice = TRADER_ALL,
/obj/item/eightball = TRADER_ALL,
/obj/item/weapon/gun/energy/wand/toy = TRADER_THIS_TYPE,
/obj/item/weapon/spirit_board = TRADER_ALL
/obj/item/gun/energy/wand/toy = TRADER_THIS_TYPE,
/obj/item/spirit_board = TRADER_ALL
)
/datum/trader/electronics
@@ -77,32 +77,32 @@
)
possible_trading_items = list(
/obj/item/weapon/computer_hardware/battery_module = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/computer_hardware/battery_module/lambda = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/circuitboard/telecomms = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/unary_atmos = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/arcade = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/odysseus = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/honker = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/durand = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/gygax = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/ripley = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/mecha/phazon = TRADER_BLACKLIST,
/obj/item/weapon/circuitboard/broken = TRADER_BLACKLIST,
/obj/item/weapon/storage/box/lights/colored = TRADER_SUBTYPES_ONLY,
/obj/item/computer_hardware/battery_module = TRADER_SUBTYPES_ONLY,
/obj/item/computer_hardware/battery_module/lambda = TRADER_BLACKLIST,
/obj/item/circuitboard = TRADER_SUBTYPES_ONLY,
/obj/item/circuitboard/telecomms = TRADER_BLACKLIST,
/obj/item/circuitboard/unary_atmos = TRADER_BLACKLIST,
/obj/item/circuitboard/arcade = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/odysseus = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/honker = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/durand = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/gygax = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/ripley = TRADER_BLACKLIST,
/obj/item/circuitboard/mecha/phazon = TRADER_BLACKLIST,
/obj/item/circuitboard/broken = TRADER_BLACKLIST,
/obj/item/storage/box/lights/colored = TRADER_SUBTYPES_ONLY,
/obj/item/stack/cable_coil = TRADER_SUBTYPES_ONLY,
/obj/item/stack/cable_coil/cyborg = TRADER_BLACKLIST,
/obj/item/stack/cable_coil/random = TRADER_BLACKLIST,
/obj/item/stack/cable_coil/cut = TRADER_BLACKLIST,
/obj/item/weapon/airalarm_electronics = TRADER_THIS_TYPE,
/obj/item/weapon/airlock_electronics = TRADER_ALL,
/obj/item/weapon/cell/high = TRADER_THIS_TYPE,
/obj/item/weapon/cell/super = TRADER_THIS_TYPE,
/obj/item/weapon/cell/hyper = TRADER_THIS_TYPE,
/obj/item/weapon/module = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/tracker_electronics = TRADER_THIS_TYPE
/obj/item/airalarm_electronics = TRADER_THIS_TYPE,
/obj/item/airlock_electronics = TRADER_ALL,
/obj/item/cell/high = TRADER_THIS_TYPE,
/obj/item/cell/super = TRADER_THIS_TYPE,
/obj/item/cell/hyper = TRADER_THIS_TYPE,
/obj/item/module = TRADER_SUBTYPES_ONLY,
/obj/item/tracker_electronics = TRADER_THIS_TYPE
)
@@ -231,7 +231,7 @@ Sells devices, odds and ends, and medical stuff
/obj/item/device/flashlight = TRADER_ALL,
/obj/item/device/kit/paint = TRADER_SUBTYPES_ONLY,
/obj/item/device/kit/paint/ripley/fluff = TRADER_BLACKLIST_ALL,
/obj/item/weapon/aicard = TRADER_THIS_TYPE,
/obj/item/aicard = TRADER_THIS_TYPE,
/obj/item/device/binoculars = TRADER_THIS_TYPE,
/obj/item/device/flash = TRADER_THIS_TYPE,
/obj/item/device/floor_painter = TRADER_THIS_TYPE,
@@ -292,16 +292,16 @@ Sells devices, odds and ends, and medical stuff
possible_origins = list("AI for the Straight Guy", "Mechanical Buddies", "Bot Chop Shop", "Omni Consumer Projects")
possible_wanted_items = list(
/obj/item/weapon/bucket_sensor = TRADER_THIS_TYPE,
/obj/item/weapon/toolbox_tiles_sensor = TRADER_THIS_TYPE,
/obj/item/weapon/firstaid_arm_assembly = TRADER_THIS_TYPE,
/obj/item/bucket_sensor = TRADER_THIS_TYPE,
/obj/item/toolbox_tiles_sensor = TRADER_THIS_TYPE,
/obj/item/firstaid_arm_assembly = TRADER_THIS_TYPE,
/obj/item/stack/material/steel = TRADER_THIS_TYPE
)
possible_trading_items = list(
/obj/item/device/paicard = TRADER_THIS_TYPE,
/obj/item/weapon/aicard = TRADER_THIS_TYPE,
/obj/item/aicard = TRADER_THIS_TYPE,
/mob/living/bot = TRADER_SUBTYPES_ONLY
)
@@ -350,25 +350,25 @@ Sells devices, odds and ends, and medical stuff
)
possible_trading_items = list(
/obj/item/weapon/pickaxe = TRADER_ALL,
/obj/item/weapon/pickaxe/offhand = TRADER_BLACKLIST,
/obj/item/weapon/pickaxe/borgdrill = TRADER_BLACKLIST,
/obj/item/weapon/shovel = TRADER_THIS_TYPE,
/obj/item/pickaxe = TRADER_ALL,
/obj/item/pickaxe/offhand = TRADER_BLACKLIST,
/obj/item/pickaxe/borgdrill = TRADER_BLACKLIST,
/obj/item/shovel = TRADER_THIS_TYPE,
/obj/item/stack/flag = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/rfd_ammo = TRADER_THIS_TYPE,
/obj/item/weapon/rfd/mining = TRADER_THIS_TYPE,
/obj/item/weapon/ore_radar = TRADER_THIS_TYPE,
/obj/item/rfd_ammo = TRADER_THIS_TYPE,
/obj/item/rfd/mining = TRADER_THIS_TYPE,
/obj/item/ore_radar = TRADER_THIS_TYPE,
/obj/item/device/wormhole_jaunter = TRADER_THIS_TYPE,
/obj/item/weapon/resonator = TRADER_ALL,
/obj/item/weapon/autochisel = TRADER_ALL,
/obj/item/resonator = TRADER_ALL,
/obj/item/autochisel = TRADER_ALL,
/obj/structure/sculpting_block = TRADER_ALL,
/obj/item/weapon/plastique/seismic = TRADER_THIS_TYPE,
/obj/item/weapon/gun/custom_ka/frame01/prebuilt = TRADER_THIS_TYPE,
/obj/item/weapon/gun/custom_ka/frame02/prebuilt = TRADER_THIS_TYPE,
/obj/item/weapon/gun/custom_ka/frame03/prebuilt = TRADER_THIS_TYPE,
/obj/item/weapon/gun/custom_ka/frame04/prebuilt = TRADER_THIS_TYPE,
/obj/item/weapon/gun/custom_ka/frame05/prebuilt = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/plasmacutter = TRADER_THIS_TYPE,
/obj/item/plastique/seismic = TRADER_THIS_TYPE,
/obj/item/gun/custom_ka/frame01/prebuilt = TRADER_THIS_TYPE,
/obj/item/gun/custom_ka/frame02/prebuilt = TRADER_THIS_TYPE,
/obj/item/gun/custom_ka/frame03/prebuilt = TRADER_THIS_TYPE,
/obj/item/gun/custom_ka/frame04/prebuilt = TRADER_THIS_TYPE,
/obj/item/gun/custom_ka/frame05/prebuilt = TRADER_THIS_TYPE,
/obj/item/gun/energy/plasmacutter = TRADER_THIS_TYPE,
/obj/item/clothing/head/helmet/space/void/mining = TRADER_THIS_TYPE,
/obj/item/clothing/suit/space/void/mining = TRADER_THIS_TYPE,
/obj/machinery/mining/drill = TRADER_THIS_TYPE,
code/datums/trading/misc.dm
+32 -32
View File
@@ -89,24 +89,24 @@
/obj/item/clothing/shoes/clown_shoes = TRADER_THIS_TYPE,
/obj/item/clothing/under/rank/clown = TRADER_THIS_TYPE,
/obj/item/device/pda/clown = TRADER_THIS_TYPE,
/obj/item/weapon/cartridge/clown = TRADER_THIS_TYPE,
/obj/item/weapon/stamp/clown = TRADER_THIS_TYPE,
/obj/item/weapon/storage/backpack/clown = TRADER_THIS_TYPE,
/obj/item/weapon/bananapeel = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE,
/obj/item/weapon/bikehorn = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/spray/waterflower = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/capgun = TRADER_THIS_TYPE,
/obj/item/cartridge/clown = TRADER_THIS_TYPE,
/obj/item/stamp/clown = TRADER_THIS_TYPE,
/obj/item/storage/backpack/clown = TRADER_THIS_TYPE,
/obj/item/bananapeel = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE,
/obj/item/bikehorn = TRADER_THIS_TYPE,
/obj/item/reagent_containers/spray/waterflower = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/capgun = TRADER_THIS_TYPE,
/obj/item/clothing/mask/fakemoustache = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/wand/toy = TRADER_THIS_TYPE,
/obj/item/weapon/grenade/spawnergrenade/fake_carp = TRADER_THIS_TYPE,
/obj/item/weapon/grenade/spawnergrenade/singularity/toy = TRADER_THIS_TYPE,
/obj/item/weapon/grenade/fake = TRADER_THIS_TYPE,
/obj/item/weapon/gun/launcher/pneumatic/small = TRADER_THIS_TYPE,
/obj/item/gun/energy/wand/toy = TRADER_THIS_TYPE,
/obj/item/grenade/spawnergrenade/fake_carp = TRADER_THIS_TYPE,
/obj/item/grenade/spawnergrenade/singularity/toy = TRADER_THIS_TYPE,
/obj/item/grenade/fake = TRADER_THIS_TYPE,
/obj/item/gun/launcher/pneumatic/small = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/monkeymask = TRADER_THIS_TYPE,
/obj/item/clothing/suit/monkeysuit = TRADER_THIS_TYPE,
/obj/item/clothing/mask/luchador = TRADER_ALL,
/obj/item/weapon/gun/bang = TRADER_SUBTYPES_ONLY
/obj/item/gun/bang = TRADER_SUBTYPES_ONLY
)
/datum/trader/ship/replica_shop
@@ -133,7 +133,7 @@
possible_trading_items = list(
/obj/item/clothing/head/wizard/magus = TRADER_THIS_TYPE,
/obj/item/weapon/shield/buckler = TRADER_THIS_TYPE,
/obj/item/shield/buckler = TRADER_THIS_TYPE,
/obj/item/clothing/head/redcoat = TRADER_THIS_TYPE,
/obj/item/clothing/head/powdered_wig = TRADER_THIS_TYPE,
/obj/item/clothing/head/hasturhood = TRADER_THIS_TYPE,
@@ -156,14 +156,14 @@
/obj/item/clothing/under/kilt = TRADER_THIS_TYPE,
/obj/item/clothing/under/redcoat = TRADER_THIS_TYPE,
/obj/item/clothing/under/soviet = TRADER_THIS_TYPE,
/obj/item/weapon/material/harpoon = TRADER_THIS_TYPE,
/obj/item/weapon/material/sword = TRADER_ALL,
/obj/item/weapon/material/scythe = TRADER_THIS_TYPE,
/obj/item/weapon/material/star = TRADER_THIS_TYPE,
/obj/item/weapon/material/twohanded/baseballbat = TRADER_THIS_TYPE,
/obj/item/weapon/material/twohanded/pike = TRADER_ALL,
/obj/item/weapon/material/twohanded/zweihander = TRADER_THIS_TYPE,
/obj/item/weapon/melee/whip = TRADER_THIS_TYPE
/obj/item/material/harpoon = TRADER_THIS_TYPE,
/obj/item/material/sword = TRADER_ALL,
/obj/item/material/scythe = TRADER_THIS_TYPE,
/obj/item/material/star = TRADER_THIS_TYPE,
/obj/item/material/twohanded/baseballbat = TRADER_THIS_TYPE,
/obj/item/material/twohanded/pike = TRADER_ALL,
/obj/item/material/twohanded/zweihander = TRADER_THIS_TYPE,
/obj/item/melee/whip = TRADER_THIS_TYPE
)
@@ -172,15 +172,15 @@
name_language = LANGUAGE_UNATHI
origin = "Azazi Bulk Supply Guild"
possible_trading_items = list(
/obj/item/weapon/rig/unathi = TRADER_ALL,
/obj/item/weapon/rig/internalaffairs = TRADER_THIS_TYPE,
/obj/item/weapon/rig/industrial = TRADER_THIS_TYPE,
/obj/item/weapon/rig/eva = TRADER_THIS_TYPE,
/obj/item/weapon/rig/ce = TRADER_THIS_TYPE,
/obj/item/weapon/rig/hazmat = TRADER_THIS_TYPE,
/obj/item/weapon/rig/medical = TRADER_THIS_TYPE,
/obj/item/weapon/rig/hazard = TRADER_THIS_TYPE,
/obj/item/weapon/rig/combat = TRADER_THIS_TYPE,
/obj/item/rig/unathi = TRADER_ALL,
/obj/item/rig/internalaffairs = TRADER_THIS_TYPE,
/obj/item/rig/industrial = TRADER_THIS_TYPE,
/obj/item/rig/eva = TRADER_THIS_TYPE,
/obj/item/rig/ce = TRADER_THIS_TYPE,
/obj/item/rig/hazmat = TRADER_THIS_TYPE,
/obj/item/rig/medical = TRADER_THIS_TYPE,
/obj/item/rig/hazard = TRADER_THIS_TYPE,
/obj/item/rig/combat = TRADER_THIS_TYPE,
/obj/item/rig_module/device/healthscanner = TRADER_THIS_TYPE,
/obj/item/rig_module/device/drill = TRADER_THIS_TYPE,
/obj/item/rig_module/device/rfd_c = TRADER_THIS_TYPE,
code/datums/trading/trade.dm
+1 -1
View File
@@ -153,7 +153,7 @@
else if(is_type_in_list(offer,blacklisted_trade_items))
return 0
if(istype(offer,/obj/item/weapon/spacecash))
if(istype(offer,/obj/item/spacecash))
if(!(trade_flags & TRADER_MONEY))
return TRADER_NO_MONEY
else
code/datums/trading/unique.dm
+40 -40
View File
@@ -30,37 +30,37 @@
origin = "Cloaked ship"
possible_wanted_items = list (
/obj/item/weapon/gun/energy/captain = TRADER_THIS_TYPE,
/obj/item/weapon/hand_tele = TRADER_THIS_TYPE,
/obj/item/gun/energy/captain = TRADER_THIS_TYPE,
/obj/item/hand_tele = TRADER_THIS_TYPE,
/obj/item/blueprints = TRADER_THIS_TYPE,
/obj/item/weapon/disk/nuclear = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/hypospray = TRADER_ALL,
/obj/item/weapon/card/id/captains_spare = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/heavysniper/tranq = TRADER_THIS_TYPE,
/obj/item/disk/nuclear = TRADER_THIS_TYPE,
/obj/item/reagent_containers/hypospray = TRADER_ALL,
/obj/item/card/id/captains_spare = TRADER_THIS_TYPE,
/obj/item/gun/projectile/heavysniper/tranq = TRADER_THIS_TYPE,
/obj/item/stack/telecrystal = TRADER_THIS_TYPE,
/obj/item/bluespace_crystal = TRADER_ALL,
/obj/random/telecrystals = TRADER_THIS_TYPE,
/obj/item/device/pin_extractor = TRADER_THIS_TYPE,
/obj/item/weapon/circuitboard/aicore = TRADER_THIS_TYPE,
/obj/item/weapon/aiModule = TRADER_SUBTYPES_ONLY
/obj/item/circuitboard/aicore = TRADER_THIS_TYPE,
/obj/item/aiModule = TRADER_SUBTYPES_ONLY
)
possible_trading_items = list (
/obj/item/weapon/antag_spawner/borg_tele = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/syndie_kit = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/syndie/c4explosive = TRADER_ALL,
/obj/item/weapon/melee/energy/sword = TRADER_ALL,
/obj/item/weapon/melee/energy/sword/color = TRADER_BLACKLIST,
/obj/item/weapon/melee/energy/axe = TRADER_THIS_TYPE,
/obj/item/weapon/shield/energy = TRADER_ALL,
/obj/item/antag_spawner/borg_tele = TRADER_THIS_TYPE,
/obj/item/storage/box/syndie_kit = TRADER_SUBTYPES_ONLY,
/obj/item/syndie/c4explosive = TRADER_ALL,
/obj/item/melee/energy/sword = TRADER_ALL,
/obj/item/melee/energy/sword/color = TRADER_BLACKLIST,
/obj/item/melee/energy/axe = TRADER_THIS_TYPE,
/obj/item/shield/energy = TRADER_ALL,
/obj/item/clothing/gloves/force/syndicate = TRADER_THIS_TYPE,
/obj/item/weapon/card/id/syndicate = TRADER_THIS_TYPE,
/obj/item/weapon/rig/merc = TRADER_THIS_TYPE,
/obj/item/weapon/rig/light/stealth = TRADER_THIS_TYPE,
/obj/item/weapon/rig/light/hacker = TRADER_THIS_TYPE,
/obj/item/weapon/gun/launcher/grenade = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/sniperrifle = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/automatic = TRADER_SUBTYPES_ONLY,
/obj/item/card/id/syndicate = TRADER_THIS_TYPE,
/obj/item/rig/merc = TRADER_THIS_TYPE,
/obj/item/rig/light/stealth = TRADER_THIS_TYPE,
/obj/item/rig/light/hacker = TRADER_THIS_TYPE,
/obj/item/gun/launcher/grenade = TRADER_THIS_TYPE,
/obj/item/gun/energy/sniperrifle = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic = TRADER_SUBTYPES_ONLY,
/obj/mecha/combat/marauder/mauler = TRADER_THIS_TYPE,
/obj/mecha/working/ripley/deathripley = TRADER_THIS_TYPE
)
@@ -87,8 +87,8 @@
origin = "SGS Severance"
possible_wanted_items = list(
/obj/item/weapon/reagent_containers/food/snacks/human = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/reagent_containers/food/snacks/meat/human = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/human = TRADER_SUBTYPES_ONLY,
/obj/item/reagent_containers/food/snacks/meat/human = TRADER_THIS_TYPE,
/mob/living/carbon/human = TRADER_ALL
)
@@ -96,9 +96,9 @@
/obj/mecha/combat = TRADER_SUBTYPES_ONLY,
/obj/mecha/combat/phazon = TRADER_BLACKLIST_ALL,
/obj/mecha/combat/tank = TRADER_BLACKLIST_ALL,
/obj/item/weapon/gun/projectile/automatic/rifle = TRADER_SUBTYPES_ONLY,
/obj/item/weapon/gun/energy/pulse = TRADER_ALL,
/obj/item/weapon/gun/energy/rifle/pulse = TRADER_THIS_TYPE
/obj/item/gun/projectile/automatic/rifle = TRADER_SUBTYPES_ONLY,
/obj/item/gun/energy/pulse = TRADER_ALL,
/obj/item/gun/energy/rifle/pulse = TRADER_THIS_TYPE
)
blacklisted_trade_items = list(/datum/species/monkey, /datum/species/machine, /datum/species/bug, /datum/species/diona)
@@ -126,12 +126,12 @@
origin = "Floating rock"
possible_wanted_items = list(
/obj/item/weapon/ore = TRADER_ALL
/obj/item/ore = TRADER_ALL
)
possible_trading_items = list(
/obj/machinery/power/supermatter = TRADER_ALL,
/obj/item/custom_ka_upgrade/barrels/supermatter = TRADER_THIS_TYPE,
/obj/item/weapon/aiModule = TRADER_SUBTYPES_ONLY
/obj/item/aiModule = TRADER_SUBTYPES_ONLY
)
speech = list(
@@ -155,22 +155,22 @@
name_language = LANGUAGE_VAURCA
possible_wanted_items = list(
/obj/item/weapon/reagent_containers/food/snacks/koisbar = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = TRADER_THIS_TYPE,
/obj/item/weapon/reagent_containers/food/snacks/grown/kois = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/koisbar = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/koisbar_clean = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/grown/kois = TRADER_THIS_TYPE,
/obj/item/stack/material/phoron = TRADER_THIS_TYPE
)
possible_trading_items = list(
/obj/item/clothing/mask/breath/vaurca = TRADER_THIS_TYPE,
/obj/item/weapon/melee/energy/vaurca = TRADER_THIS_TYPE,
/obj/item/melee/energy/vaurca = TRADER_THIS_TYPE,
/obj/item/vaurca/box = TRADER_THIS_TYPE,
/obj/item/weapon/melee/vaurca/rock = TRADER_THIS_TYPE,
/obj/item/weapon/grenade/spawnergrenade/vaurca = TRADER_THIS_TYPE,
/obj/item/melee/vaurca/rock = TRADER_THIS_TYPE,
/obj/item/grenade/spawnergrenade/vaurca = TRADER_THIS_TYPE,
/obj/item/clothing/suit/space/void/vaurca = TRADER_THIS_TYPE,
/obj/item/clothing/head/helmet/space/void/vaurca = TRADER_THIS_TYPE,
/obj/item/clothing/shoes/magboots/vox/vaurca = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/vaurca/blaster = TRADER_THIS_TYPE
/obj/item/gun/energy/vaurca/blaster = TRADER_THIS_TYPE
)
speech = list(
@@ -199,12 +199,12 @@
/obj/item/stack/telecrystal = TRADER_THIS_TYPE,
/obj/item/organ/brain/golem = TRADER_THIS_TYPE,
/obj/item/device/soulstone = TRADER_THIS_TYPE,
/obj/item/weapon/circuitboard/telesci_console = TRADER_THIS_TYPE,
/obj/item/weapon/circuitboard/telesci_pad = TRADER_THIS_TYPE,
/obj/item/circuitboard/telesci_console = TRADER_THIS_TYPE,
/obj/item/circuitboard/telesci_pad = TRADER_THIS_TYPE,
/obj/item/phylactery = TRADER_THIS_TYPE,
/obj/item/blueprints = TRADER_THIS_TYPE,
/obj/item/weapon/storage/backpack/holding = TRADER_THIS_TYPE,
/obj/item/weapon/teleportation_scroll = TRADER_THIS_TYPE
/obj/item/storage/backpack/holding = TRADER_THIS_TYPE,
/obj/item/teleportation_scroll = TRADER_THIS_TYPE
)
possible_trading_items = list(
code/datums/trading/vox.dm
+4 -4
View File
@@ -40,14 +40,14 @@
)
possible_wanted_items = list(
/obj/item/weapon = TRADER_SUBTYPES_ONLY,
/obj/item = TRADER_SUBTYPES_ONLY,
/obj/item/stack/material = TRADER_SUBTYPES_ONLY,
/obj/item/stack/material/cyborg = TRADER_BLACKLIST_ALL,
/obj/item/organ = TRADER_SUBTYPES_ONLY
)
possible_trading_items = list(
/obj/item/weapon/gun/projectile/dartgun/vox = TRADER_SUBTYPES_ONLY,
/obj/item/gun/projectile/dartgun/vox = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/tool = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg = TRADER_SUBTYPES_ONLY,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot = TRADER_SUBTYPES_ONLY,
@@ -59,8 +59,8 @@
/obj/item/clothing/accessory/badge/old/fluff = TRADER_BLACKLIST_ALL,
/obj/item/robot_parts = TRADER_SUBTYPES_ONLY,
/obj/item/robot_parts/robot_component = TRADER_BLACKLIST,
/obj/item/weapon/storage/pill_bottle/happy = TRADER_THIS_TYPE,
/obj/item/weapon/storage/pill_bottle/zoom = TRADER_THIS_TYPE,
/obj/item/storage/pill_bottle/happy = TRADER_THIS_TYPE,
/obj/item/storage/pill_bottle/zoom = TRADER_THIS_TYPE,
)
mob_transfer_message = "<span class='danger'>You are transported to the ORIGIN. When the transportation dizziness wears off, you find you are surrounded by cackling Vox...</span>"
code/datums/trading/weaponry.dm
+42 -42
View File
@@ -18,29 +18,29 @@
)
possible_trading_items = list(
/obj/item/weapon/gun/projectile/pistol = TRADER_ALL,
/obj/item/weapon/gun/projectile/colt = TRADER_ALL,
/obj/item/weapon/gun/projectile/sec = TRADER_ALL,
/obj/item/weapon/gun/projectile/shotgun/pump = TRADER_ALL,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel = TRADER_ALL,
/obj/item/weapon/gun/projectile/tanto = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/detective = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/deckard = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/leyon = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/automatic/x9 = TRADER_THIS_TYPE,
/obj/item/gun/projectile/pistol = TRADER_ALL,
/obj/item/gun/projectile/colt = TRADER_ALL,
/obj/item/gun/projectile/sec = TRADER_ALL,
/obj/item/gun/projectile/shotgun/pump = TRADER_ALL,
/obj/item/gun/projectile/shotgun/doublebarrel = TRADER_ALL,
/obj/item/gun/projectile/tanto = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/detective = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/deckard = TRADER_THIS_TYPE,
/obj/item/gun/projectile/leyon = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/x9 = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c45m = TRADER_ALL,
/obj/item/ammo_magazine/c45m/empty = TRADER_BLACKLIST,
/obj/item/ammo_magazine/mc10mm = TRADER_ALL,
/obj/item/ammo_magazine/mc10mm/leyon = TRADER_BLACKLIST,
/obj/item/ammo_magazine/mc10mm/empty = TRADER_BLACKLIST,
/obj/item/weapon/storage/box/ammo10mm = TRADER_THIS_TYPE,
/obj/item/storage/box/ammo10mm = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c38 = TRADER_ALL,
/obj/item/ammo_magazine/c45x = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/beanbags = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunammo = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunshells = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/haywireshells = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/incendiaryshells = TRADER_THIS_TYPE,
/obj/item/storage/box/beanbags = TRADER_THIS_TYPE,
/obj/item/storage/box/shotgunammo = TRADER_THIS_TYPE,
/obj/item/storage/box/shotgunshells = TRADER_THIS_TYPE,
/obj/item/storage/box/haywireshells = TRADER_THIS_TYPE,
/obj/item/storage/box/incendiaryshells = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL
)
@@ -65,15 +65,15 @@
)
possible_trading_items = list(
/obj/item/weapon/gun/energy/taser = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/stunrevolver = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/xray = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/rifle = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/rifle/laser = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/gun = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/pistol = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/gun/nuclear = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/laser/shotgun = TRADER_THIS_TYPE,
/obj/item/gun/energy/taser = TRADER_THIS_TYPE,
/obj/item/gun/energy/stunrevolver = TRADER_THIS_TYPE,
/obj/item/gun/energy/xray = TRADER_THIS_TYPE,
/obj/item/gun/energy/rifle = TRADER_THIS_TYPE,
/obj/item/gun/energy/rifle/laser = TRADER_THIS_TYPE,
/obj/item/gun/energy/gun = TRADER_THIS_TYPE,
/obj/item/gun/energy/pistol = TRADER_THIS_TYPE,
/obj/item/gun/energy/gun/nuclear = TRADER_THIS_TYPE,
/obj/item/gun/energy/laser/shotgun = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_ALL,
/obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL
)
@@ -96,22 +96,22 @@
)
possible_trading_items = list(
/obj/item/weapon/gun/projectile/shotgun/pump/rifle = TRADER_ALL,
/obj/item/weapon/gun/projectile/dragunov = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/silenced = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/automatic/tommygun = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/automatic/mini_uzi = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/improvised_handgun = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/shotgun/improvised = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/retro = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/derringer = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/pirate = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/contender = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/lemat = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/vintage = TRADER_THIS_TYPE,
/obj/item/weapon/gun/energy/rifle/icelance = TRADER_THIS_TYPE,
/obj/item/gun/projectile/shotgun/pump/rifle = TRADER_ALL,
/obj/item/gun/projectile/dragunov = TRADER_THIS_TYPE,
/obj/item/gun/projectile/silenced = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/tommygun = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/mini_uzi = TRADER_THIS_TYPE,
/obj/item/gun/projectile/improvised_handgun = TRADER_THIS_TYPE,
/obj/item/gun/projectile/shotgun/improvised = TRADER_THIS_TYPE,
/obj/item/gun/energy/retro = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/derringer = TRADER_THIS_TYPE,
/obj/item/gun/projectile/pirate = TRADER_THIS_TYPE,
/obj/item/gun/projectile/contender = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/lemat = TRADER_THIS_TYPE,
/obj/item/gun/projectile/shotgun/pump/rifle/vintage = TRADER_THIS_TYPE,
/obj/item/gun/energy/rifle/icelance = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/storage/bayonet = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/cannon = TRADER_THIS_TYPE,
/obj/item/gun/projectile/cannon = TRADER_THIS_TYPE,
/obj/item/ammo_casing/cannon = TRADER_ALL
)
@@ -152,7 +152,7 @@
/obj/item/clothing/shoes/swat = TRADER_THIS_TYPE,
/obj/item/clothing/under/tactical = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/tactical = TRADER_THIS_TYPE,
/obj/item/weapon/shield/riot/tact = TRADER_THIS_TYPE,
/obj/item/weapon/storage/belt/security/tactical = TRADER_THIS_TYPE,
/obj/item/shield/riot/tact = TRADER_THIS_TYPE,
/obj/item/storage/belt/security/tactical = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/storage/bandolier = TRADER_THIS_TYPE
)
code/datums/uplink/ammunition.dm
+1 -1
View File
@@ -33,4 +33,4 @@
/datum/uplink_item/item/ammo/sniperammo
name = "14.5mm"
item_cost = 4
path = /obj/item/weapon/storage/box/sniperammo
path = /obj/item/storage/box/sniperammo
code/datums/uplink/announcements.dm
+1 -1
View File
@@ -41,7 +41,7 @@
if(!user)
return 0
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
var/datum/record/general/random_record
if(SSrecords.records.len)
random_record = pick(SSrecords.records)
code/datums/uplink/devices and tools.dm
+11 -11
View File
@@ -7,12 +7,12 @@
/datum/uplink_item/item/tools/toolbox
name = "Fully Loaded Toolbox"
item_cost = 2
path = /obj/item/weapon/storage/toolbox/syndicate
path = /obj/item/storage/toolbox/syndicate
/datum/uplink_item/item/tools/money
name = "Operations Funding"
item_cost = 2
path = /obj/item/weapon/storage/secure/briefcase/money
path = /obj/item/storage/secure/briefcase/money
desc = "A briefcase with 10,000 untraceable credits for funding your sneaky activities."
/datum/uplink_item/item/tools/firingpin //todo, make this a special syndicate one instead of just a normal one?
@@ -30,17 +30,17 @@
/datum/uplink_item/item/tools/clerical
name = "Morphic Clerical Kit"
item_cost = 3
path = /obj/item/weapon/storage/box/syndie_kit/clerical
path = /obj/item/storage/box/syndie_kit/clerical
/datum/uplink_item/item/tools/plastique
name = "C-4 (Destroys walls)"
item_cost = 4
path = /obj/item/weapon/plastique
path = /obj/item/plastique
/datum/uplink_item/item/tools/heavy_vest
name = "Heavy Armor Kit"
item_cost = 4
path = /obj/item/weapon/storage/box/syndie_kit/armor
path = /obj/item/storage/box/syndie_kit/armor
/datum/uplink_item/item/tools/encryptionkey_radio
name = "Encrypted Radio Channel Key"
@@ -55,7 +55,7 @@
/datum/uplink_item/item/tools/emag
name = "Cryptographic Sequencer"
item_cost = 6
path = /obj/item/weapon/card/emag
path = /obj/item/card/emag
/datum/uplink_item/item/tools/hacking_tool
name = "Door Hacking Tool"
@@ -68,7 +68,7 @@
/datum/uplink_item/item/tools/space_suit
name = "Space Suit"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/space
path = /obj/item/storage/box/syndie_kit/space
/datum/uplink_item/item/tools/thermal
name = "Thermal Imaging Glasses"
@@ -83,7 +83,7 @@
/datum/uplink_item/item/tools/teleporter
name = "Teleporter Circuit Board"
item_cost = 10
path = /obj/item/weapon/circuitboard/teleporter
path = /obj/item/circuitboard/teleporter
/datum/uplink_item/item/tools/teleporter/New()
..()
@@ -92,7 +92,7 @@
/datum/uplink_item/item/tools/ai_module
name = "Hacked AI Upload Module"
item_cost = 14
path = /obj/item/weapon/aiModule/syndicate
path = /obj/item/aiModule/syndicate
/datum/uplink_item/item/tools/supply_beacon
name = "Hacked Supply Beacon (DANGER!)"
@@ -102,13 +102,13 @@
/datum/uplink_item/item/tools/advancedpinpointer
name = "Advanced pinpointer"
item_cost = 15
path = /obj/item/weapon/pinpointer/advpinpointer
path = /obj/item/pinpointer/advpinpointer
desc = "An advanced pinpointer that can find any target with DNA along with various other items."
/datum/uplink_item/item/tools/syndieborg
name = "Syndicate Cyborg Teleporter"
item_cost = 35
path = /obj/item/weapon/antag_spawner/borg_tele
path = /obj/item/antag_spawner/borg_tele
/datum/uplink_item/item/tools/heatpatch
name = "HUDPatch, Thermal"
code/datums/uplink/grenades.dm
+5 -5
View File
@@ -7,25 +7,25 @@
/datum/uplink_item/item/grenades/manhack
name = "Manhack Delivery Grenade"
item_cost = 3
path = /obj/item/weapon/grenade/spawnergrenade/manhacks
path = /obj/item/grenade/spawnergrenade/manhacks
/datum/uplink_item/item/grenades/anti_photon
name = "5xPhoton Disruption Grenades"
item_cost = 4
path = /obj/item/weapon/storage/box/anti_photons
path = /obj/item/storage/box/anti_photons
/datum/uplink_item/item/grenades/smoke
name = "5xSmoke Grenades"
item_cost = 4
path = /obj/item/weapon/storage/box/smokes
path = /obj/item/storage/box/smokes
/datum/uplink_item/item/grenades/emp
name = "5xEMP Grenades"
item_cost = 6
path = /obj/item/weapon/storage/box/emps
path = /obj/item/storage/box/emps
/datum/uplink_item/item/grenades/frag
name = "5xFrag Grenades"
item_cost = 12
path = /obj/item/weapon/storage/box/frags
path = /obj/item/storage/box/frags
code/datums/uplink/hardsuit_modules.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/datum/uplink_item/item/hardsuit_modules/ewar_voice
name = "Electrowarfare Suite and Voice Synthesiser"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
path = /obj/item/storage/box/syndie_kit/ewar_voice
/datum/uplink_item/item/hardsuit_modules/maneuvering_jets
name = "Maneuvering Jets"
code/datums/uplink/highly visible and dangerous weapons.dm
+15 -15
View File
@@ -7,12 +7,12 @@
/datum/uplink_item/item/visible_weapons/dartgun
name = "Dart Gun"
item_cost = 5
path = /obj/item/weapon/gun/projectile/dartgun
path = /obj/item/gun/projectile/dartgun
/datum/uplink_item/item/visible_weapons/crossbow
name = "Energy Crossbow"
item_cost = 6
path = /obj/item/weapon/gun/energy/crossbow
path = /obj/item/gun/energy/crossbow
/datum/uplink_item/item/visible_weapons/forcegloves
name = "Force Gloves"
@@ -22,12 +22,12 @@
/datum/uplink_item/item/visible_weapons/energy_sword
name = "Energy Sword"
item_cost = 8
path = /obj/item/weapon/melee/energy/sword
path = /obj/item/melee/energy/sword
/datum/uplink_item/item/visible_weapons/g9mm
name = "Silenced 9mm"
item_cost = 8
path = /obj/item/weapon/storage/box/syndie_kit/g9mm
path = /obj/item/storage/box/syndie_kit/g9mm
/datum/uplink_item/item/visible_weapons/riggedlaser
name = "Exosuit (APLU) Rigged Laser"
@@ -37,32 +37,32 @@
/datum/uplink_item/item/visible_weapons/hammer
name = "Kneebreaker Hammer"
item_cost = 5
path = /obj/item/weapon/melee/hammer
path = /obj/item/melee/hammer
/datum/uplink_item/item/visible_weapons/revolver
name = "Revolver"
item_cost = 12
path = /obj/item/weapon/gun/projectile/revolver
path = /obj/item/gun/projectile/revolver
/datum/uplink_item/item/visible_weapons/submachinegun
name = "Tommy Gun"
item_cost = 14
path = /obj/item/weapon/gun/projectile/automatic/tommygun
path = /obj/item/gun/projectile/automatic/tommygun
/datum/uplink_item/item/visible_weapons/landmine
name = "Land Mine"
item_cost = 5
path = /obj/item/weapon/landmine
path = /obj/item/landmine
/datum/uplink_item/item/visible_weapons/emplandmine
name = "EMP Land Mine"
item_cost = 4
path = /obj/item/weapon/landmine/emp
path = /obj/item/landmine/emp
/datum/uplink_item/item/visible_weapons/sleepylandmine
name = "N2O Land Mine"
item_cost = 7
path = /obj/item/weapon/landmine/n2o
path = /obj/item/landmine/n2o
/datum/uplink_item/item/visible_weapons/powerfist
name = "Power Fist"
@@ -92,7 +92,7 @@
/datum/uplink_item/item/visible_weapons/heavysniper
name = "Anti-materiel Rifle"
item_cost = DEFAULT_TELECRYSTAL_AMOUNT
path = /obj/item/weapon/gun/projectile/heavysniper
path = /obj/item/gun/projectile/heavysniper
/datum/uplink_item/item/visible_weapons/gatling
name = "Gatling Machine Gun"
@@ -102,19 +102,19 @@
/datum/uplink_item/item/visible_weapons/chainsaw
name = "Chainsaw"
item_cost = 10
path = /obj/item/weapon/material/twohanded/chainsaw/fueled
path = /obj/item/material/twohanded/chainsaw/fueled
/datum/uplink_item/item/visible_weapons/throwing_star
name = "Steel Throwing Star"
item_cost = 2
path = /obj/item/weapon/material/star
path = /obj/item/material/star
/datum/uplink_item/item/visible_weapons/icelance
name = "Icelance Rifle"
item_cost = 6
path = /obj/item/weapon/gun/energy/rifle/icelance
path = /obj/item/gun/energy/rifle/icelance
/datum/uplink_item/item/visible_weapons/custom_ka
name = "Kinetic Laser Assembly"
item_cost = 12
path = /obj/item/weapon/gun/custom_ka/frame01/illegal
path = /obj/item/gun/custom_ka/frame01/illegal
code/datums/uplink/implants.dm
+4 -4
View File
@@ -7,21 +7,21 @@
/datum/uplink_item/item/implants/imp_freedom
name = "Freedom Implant"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom
path = /obj/item/storage/box/syndie_kit/imp_freedom
/datum/uplink_item/item/implants/imp_compress
name = "Compressed Matter Implant"
item_cost = 8
path = /obj/item/weapon/storage/box/syndie_kit/imp_compress
path = /obj/item/storage/box/syndie_kit/imp_compress
/datum/uplink_item/item/implants/imp_explosive
name = "Explosive Implant (DANGER!)"
item_cost = 10
path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive
path = /obj/item/storage/box/syndie_kit/imp_explosive
/datum/uplink_item/item/implants/imp_uplink
name = "Uplink Implant"
path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink
path = /obj/item/storage/box/syndie_kit/imp_uplink
/datum/uplink_item/item/implants/imp_uplink/New()
..()
code/datums/uplink/medical.dm
+5 -5
View File
@@ -7,27 +7,27 @@
/datum/uplink_item/item/medical/sinpockets
name = "Box of Sin-Pockets"
item_cost = 2
path = /obj/item/weapon/storage/box/sinpockets
path = /obj/item/storage/box/sinpockets
/datum/uplink_item/item/medical/combathypo
name = "Combat hypospray"
item_cost = 6
path = /obj/item/weapon/reagent_containers/hypospray/combat
path = /obj/item/reagent_containers/hypospray/combat
/datum/uplink_item/item/medical/surgery
name = "Surgery kit"
item_cost = 10
path = /obj/item/weapon/storage/firstaid/surgery
path = /obj/item/storage/firstaid/surgery
/datum/uplink_item/item/medical/combat
name = "Combat medical kit"
item_cost = 12
path = /obj/item/weapon/storage/firstaid/combat
path = /obj/item/storage/firstaid/combat
/datum/uplink_item/item/medical/stimulants
name = "Box of Combat Stimulants"
item_cost = 6
path = /obj/item/weapon/storage/box/syndie_kit/stimulants
path = /obj/item/storage/box/syndie_kit/stimulants
code/datums/uplink/specialty.dm
+1 -1
View File
@@ -47,7 +47,7 @@ Quick and easy list of all the occupations for farther expansion and addition.
/datum/uplink_item/item/specialty/crossbow
name = "Eneree Crossbow"
item_cost = 6
path = /obj/item/weapon/gun/energy/crossbow
path = /obj/item/gun/energy/crossbow
antag_job = "assistant"
*/
code/datums/uplink/stealth and camouflage items.dm
+4 -4
View File
@@ -12,17 +12,17 @@
/datum/uplink_item/item/stealth_items/spy
name = "Bug Kit"
item_cost = 2
path = /obj/item/weapon/storage/box/syndie_kit/spy
path = /obj/item/storage/box/syndie_kit/spy
/datum/uplink_item/item/stealth_items/id
name = "Agent ID card"
item_cost = 3
path = /obj/item/weapon/card/id/syndicate
path = /obj/item/card/id/syndicate
/datum/uplink_item/item/stealth_items/chameleon_kit
name = "Chameleon Kit"
item_cost = 5
path = /obj/item/weapon/storage/box/syndie_kit/chameleon
path = /obj/item/storage/box/syndie_kit/chameleon
/datum/uplink_item/item/stealth_items/voice
name = "Voice Changer"
@@ -38,7 +38,7 @@
name = "Vial of Venenum"
desc = "A vial that contains 30u of venemum. Changes DNA structure randomly, effectively masking your appearance until it wears off. Good for 15 minutes of appearance changes."
item_cost = 4
path = /obj/item/weapon/reagent_containers/glass/beaker/vial/venenum
path = /obj/item/reagent_containers/glass/beaker/vial/venenum
/datum/uplink_item/item/stealth_items/balaclava
name = "Balaclava"
code/datums/uplink/stealthy and inconspicuous weapons.dm
+6 -6
View File
@@ -7,32 +7,32 @@
/datum/uplink_item/item/stealthy_weapons/soap
name = "Subversive Soap"
item_cost = 1
path = /obj/item/weapon/soap/syndie
path = /obj/item/soap/syndie
/datum/uplink_item/item/stealthy_weapons/cigarette_kit
name = "Cigarette Kit"
item_cost = 2
path = /obj/item/weapon/storage/box/syndie_kit/cigarette
path = /obj/item/storage/box/syndie_kit/cigarette
/datum/uplink_item/item/stealthy_weapons/random_toxin
name = "Random Toxin - Beaker"
item_cost = 2
path = /obj/item/weapon/storage/box/syndie_kit/toxin
path = /obj/item/storage/box/syndie_kit/toxin
/datum/uplink_item/item/stealthy_weapons/detomatix
name = "Detomatix PDA Cartridge"
item_cost = 4
path = /obj/item/weapon/cartridge/syndicate
path = /obj/item/cartridge/syndicate
/datum/uplink_item/item/stealthy_weapons/parapen
name = "Paralysis Pen"
item_cost = 6
path = /obj/item/weapon/pen/reagent/paralysis
path = /obj/item/pen/reagent/paralysis
/datum/uplink_item/item/stealthy_weapons/concealed_cane
name = "Concealed Cane Sword"
item_cost = 9
path = /obj/item/weapon/cane/concealed
path = /obj/item/cane/concealed
/datum/uplink_item/item/stealthy_weapons/sleepy_ring
name = "Sleepy Ring"
code/datums/wires/explosive.dm
+3 -3
View File
@@ -18,14 +18,14 @@ var/const/WIRE_EXPLODE = 1
explode()
/datum/wires/explosive/c4
holder_type = /obj/item/weapon/plastique
holder_type = /obj/item/plastique
/datum/wires/explosive/c4/CanUse(var/mob/living/L)
var/obj/item/weapon/plastique/P = holder
var/obj/item/plastique/P = holder
if(P.open_panel)
return 1
return 0
/datum/wires/explosive/c4/explode()
var/obj/item/weapon/plastique/P = holder
var/obj/item/plastique/P = holder
P.explode(get_turf(P))