mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 18:13:34 +01:00
Explorer Redux (#24202)
* WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Marm
@@ -253,11 +253,11 @@
|
||||
/obj/item/toy/syndicateballoon = 1,
|
||||
/obj/item/soap/syndie = 1,
|
||||
/obj/item/clothing/under/syndicate = 1,
|
||||
/obj/item/clothing/under/syndicate/tacticool = 1,
|
||||
/obj/item/clothing/mask/gas/syndicate = 1,
|
||||
/obj/item/suppressor = 1,
|
||||
/obj/item/coin/antagtoken/syndicate = 1,
|
||||
/obj/item/storage/box/syndie_kit/cutouts = 1)
|
||||
/obj/item/storage/box/syndie_kit/space = 1,
|
||||
/obj/item/clothing/shoes/magboots/syndie = 1)
|
||||
|
||||
/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
|
||||
name = "20pc stetchkin"
|
||||
@@ -271,88 +271,72 @@
|
||||
|
||||
/obj/effect/spawner/random_spawners/syndicate/loot/level2
|
||||
name = "rare loot"
|
||||
// Loot schema: space gear, basic armor, basic ammo (10mm, rcd), drugs, more dangerous/useful gimmick items, lower-value minerals
|
||||
// Basic stealth, utility and environmental gear.
|
||||
result = list(/datum/nothing = 27,
|
||||
/obj/item/storage/box/syndie_kit/space = 1,
|
||||
/obj/item/mod/control/pre_equipped/traitor = 1,
|
||||
/obj/item/clothing/shoes/magboots/syndie = 1,
|
||||
/obj/item/clothing/suit/armor/vest/combat = 1,
|
||||
/obj/item/ammo_box/magazine/m10mm = 1,
|
||||
/obj/item/storage/pill_bottle/happy = 1,
|
||||
/obj/item/storage/pill_bottle/zoom = 1,
|
||||
/obj/item/storage/pill_bottle/random_drug_bottle = 2,
|
||||
/obj/item/storage/backpack/duffel/syndie/med/surgery = 1,
|
||||
/obj/item/clothing/shoes/chameleon/noslip = 1,
|
||||
/obj/item/storage/belt/military = 1,
|
||||
/obj/item/clothing/under/chameleon = 1,
|
||||
/obj/item/storage/backpack/satchel_flat = 1,
|
||||
/obj/item/rcd = 1,
|
||||
/obj/item/rcd_ammo = 1,
|
||||
/obj/item/stamp/chameleon = 1,
|
||||
/obj/item/flag/chameleon = 1,
|
||||
/obj/item/lighter/zippo/gonzofist = 1,
|
||||
/obj/item/clothing/gloves/fingerless/rapid = 1,
|
||||
/obj/item/grenade/spawnergrenade/manhacks = 1,
|
||||
/obj/item/grenade/syndieminibomb = 1,
|
||||
/obj/item/storage/box/syndie_kit/throwing_weapons = 1,
|
||||
/obj/item/pen/edagger = 1,
|
||||
/obj/item/stack/sheet/mineral/plasma{amount = 20} = 1,
|
||||
/obj/item/stack/sheet/mineral/silver{amount = 20} = 1,
|
||||
/obj/item/stack/sheet/mineral/gold{amount = 20} = 1,
|
||||
/obj/item/stack/sheet/mineral/uranium{amount = 20} = 1,
|
||||
/obj/item/mod/module/noslip = 1,
|
||||
/obj/item/mod/module/visor/night = 1)
|
||||
/obj/item/mod/module/visor/night = 1,
|
||||
/obj/item/clothing/gloves/color/black/thief = 1,
|
||||
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1,
|
||||
/obj/item/clothing/suit/jacket/syndicatebomber = 1,
|
||||
/obj/item/mod/module/holster/hidden = 1,
|
||||
/obj/item/storage/firstaid/tactical = 1,
|
||||
/obj/item/clothing/under/syndicate/silicon_cham = 1,
|
||||
/obj/item/storage/box/syndie_kit/camera_bug = 1,
|
||||
/obj/item/gun/projectile/automatic/toy/pistol/riot = 1,
|
||||
/obj/item/flash/cameraflash = 1,
|
||||
/obj/item/mod/module/chameleon = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1)
|
||||
|
||||
/obj/effect/spawner/random_spawners/syndicate/loot/level3
|
||||
name = "officer loot"
|
||||
// Loot schema: medkits, very useful devices (jammer, illegal upgrade, RCD), better quality ammo (AP, fire), basic weapons (pistol, empgrenade), high value ores (diamond, uranium)
|
||||
// Primarily utility items with occasional low damage weaponry.
|
||||
result = list(/datum/nothing = 25,
|
||||
/obj/item/jammer = 1,
|
||||
/obj/item/storage/firstaid/regular = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1,
|
||||
/obj/item/gun/projectile/automatic/pistol = 1,
|
||||
/obj/item/stock_parts/cell/bluespace = 1,
|
||||
/obj/item/card/emag = 1,
|
||||
/obj/item/encryptionkey/binary = 1,
|
||||
/obj/item/pinpointer/advpinpointer = 1,
|
||||
/obj/item/borg/upgrade/vtec = 1,
|
||||
/obj/item/borg/upgrade/syndicate = 1,
|
||||
/obj/item/borg/upgrade/selfrepair = 1,
|
||||
/obj/item/storage/box/syndie_kit/stechkin = 1,
|
||||
/obj/item/stack/sheet/mineral/diamond{amount = 10} = 1,
|
||||
/obj/item/stack/sheet/mineral/uranium{amount = 10} = 1,
|
||||
/obj/item/clothing/shoes/magboots/elite = 1,
|
||||
/obj/item/grenade/empgrenade = 1,
|
||||
/obj/item/grenade/clown_grenade = 1,
|
||||
/obj/item/grenade/spawnergrenade/feral_cats = 1,
|
||||
/obj/item/ammo_box/magazine/m10mm/ap = 1,
|
||||
/obj/item/ammo_box/magazine/m10mm/fire = 1,
|
||||
/obj/item/ammo_box/magazine/m10mm/hp = 1,
|
||||
/obj/item/storage/box/syndie_kit/emp = 1,
|
||||
/obj/item/toy/plushie/carpplushie/dehy_carp = 1,
|
||||
/obj/item/clothing/glasses/hud/security/chameleon = 1,
|
||||
/obj/item/mod/module/visor/thermal = 1,
|
||||
/obj/item/mod/module/stealth = 1,
|
||||
/obj/item/mod/module/power_kick = 1)
|
||||
/obj/item/mod/module/power_kick = 1,
|
||||
/obj/item/storage/box/syndidonkpockets = 1,
|
||||
/obj/item/pen/edagger = 1,
|
||||
/obj/item/door_remote/omni/access_tuner = 1,
|
||||
/obj/item/clothing/glasses/thermal = 1)
|
||||
|
||||
|
||||
/obj/effect/spawner/random_spawners/syndicate/loot/level4
|
||||
name = "armory loot"
|
||||
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
|
||||
// Loot schema: high-power weapons (m90, esword, ebow, revolver), devices that negate depot challenges (thermal glasses, chameleon device), explosives
|
||||
result = list(/obj/item/gun/projectile/automatic/c20r = 1,
|
||||
/obj/item/gun/projectile/automatic/m90 = 1,
|
||||
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate = 1,
|
||||
/obj/item/melee/energy/sword/saber = 1,
|
||||
/obj/item/gun/energy/kinetic_accelerator/crossbow = 1,
|
||||
/obj/item/gun/projectile/revolver = 1,
|
||||
/obj/item/bio_chip_implanter/shock = 1,
|
||||
/obj/item/butcher_chainsaw = 1,
|
||||
/obj/item/bee_briefcase = 1,
|
||||
/obj/item/fireaxe/energized = 1,
|
||||
/obj/item/clothing/glasses/thermal = 1,
|
||||
// Combat orientated items that could give the player an advantage if an antag messes with them.
|
||||
result = list(/obj/item/melee/energy/sword/saber = 1,
|
||||
/obj/item/autosurgeon/organ/syndicate/razorwire = 1,
|
||||
/obj/item/chameleon = 1,
|
||||
/obj/item/CQC_manual = 1,
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
|
||||
/obj/item/grenade/plastic/c4/x4 = 1,
|
||||
/obj/item/mod/control/pre_equipped/traitor_elite = 1)// Adding this as it is something an explorer can use to explore space better, that isn't a high powered murder weapon.
|
||||
/obj/item/clothing/gloves/fingerless/rapid = 1,
|
||||
/obj/item/gun/medbeam = 1,
|
||||
/obj/item/shield/energy = 1,
|
||||
/obj/item/storage/box/syndie_kit/teleporter = 1,
|
||||
/obj/item/weaponcrafting/gunkit/universal_gun_kit = 1)
|
||||
|
||||
|
||||
// Layout-affecting spawns
|
||||
|
||||
@@ -289,6 +289,11 @@
|
||||
desc = "Headset used by shaft miners."
|
||||
icon_state = "mine_headset"
|
||||
|
||||
/obj/item/radio/headset/headset_cargo/expedition
|
||||
name = "expedition radio headset"
|
||||
desc = "Headset used by space explorers."
|
||||
icon_state = "mine_headset"
|
||||
|
||||
/obj/item/radio/headset/headset_service
|
||||
name = "service radio headset"
|
||||
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
/obj/item/salvage
|
||||
name = "salvage"
|
||||
desc = "A tonne of salvage looted from bad mapping practices. Who spawned the base type? Report this on the github."
|
||||
icon = 'icons/obj/sellable.dmi'
|
||||
force = 5
|
||||
throwforce = 5
|
||||
throw_speed = 1
|
||||
throw_range = 4
|
||||
hitsound = 'sound/items/handling/salvagepickup.ogg'
|
||||
pickup_sound = 'sound/items/handling/salvagepickup.ogg'
|
||||
drop_sound = 'sound/items/handling/salvagedrop.ogg'
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
/obj/item/salvage/examine(mob/user)
|
||||
. = ..()
|
||||
. += "<span class='notice'>You can bring this back to Cargo to sell to Central Command onboard the 'NTV Arion' Supply shuttle.</span>"
|
||||
|
||||
/// Ruin Salvage, misc loot gained from looking around ruins.
|
||||
|
||||
/obj/item/salvage/ruin
|
||||
desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on the github."
|
||||
|
||||
/obj/item/salvage/ruin/pirate
|
||||
name = "rum keg"
|
||||
desc = "A highly valued keg of aged space rum. Limited edition and sure to be a collector's item."
|
||||
icon = 'icons/obj/objects.dmi'
|
||||
icon_state = "barrel"
|
||||
color = "#7e5c00" // So that it's slightly different from normal kegs
|
||||
|
||||
/obj/item/salvage/ruin/russian
|
||||
name = "armaments cache"
|
||||
desc = "A crate of old disused Belastrav ballistic firearms clearly long past their usability. This crate would make good scrap metal for shuttle construction."
|
||||
icon_state = "weapon_crate"
|
||||
|
||||
/obj/item/salvage/ruin/brick
|
||||
name = "mysterious brick"
|
||||
desc = "A peculier brick formed out of what appears to be plastic. This would make a fantastic collector's item."
|
||||
icon_state = "lego_brick"
|
||||
hitsound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
|
||||
/obj/item/salvage/ruin/brick/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/caltrop, 5, 10) // 5 to 10 damage, hits like a truck
|
||||
|
||||
/obj/item/salvage/ruin/nanotrasen
|
||||
name = "lost research notes"
|
||||
desc = "A collection of research notes penned by old Nanotrasen scientists from decades past, technology lost in time- until you found them. It is a mystery what technology Central Command will push if they could just get their hands on these notes."
|
||||
icon_state = "research_doc"
|
||||
hitsound = 'sound/items/handling/paper_pickup.ogg'
|
||||
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/paper_drop.ogg'
|
||||
|
||||
/obj/item/salvage/ruin/nanotrasen/Initialize(mapload)
|
||||
. = ..()
|
||||
origin_tech = pick(list("combat=5", "materials=5", "engineering=5", "biotech=5", "power=5", "data=5"))
|
||||
/obj/item/salvage/ruin/carp
|
||||
name = "carp scales"
|
||||
desc = "A collection of scales shed from a corrupted space carp. Their culinary potential could mean untold riches for Nanotrasen."
|
||||
icon_state = "dragon_scales"
|
||||
hitsound = sound('sound/effects/hit_on_shattered_glass.ogg', 20)
|
||||
pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
|
||||
drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
|
||||
|
||||
/obj/item/salvage/ruin/tablet
|
||||
name = "mysterious tablet"
|
||||
desc = "A mysterious and old stone tablet. When you read the text on it, you start getting chills."
|
||||
icon_state = "stone_tablet"
|
||||
hitsound = sound('sound/effects/break_stone.ogg', 20)
|
||||
pickup_sound = sound('sound/hallucinations/im_here2.ogg', 10)
|
||||
drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
|
||||
|
||||
/// Loot salvage, gained from fighting space simplemobs.
|
||||
|
||||
/obj/item/salvage/loot
|
||||
desc = "A tonne of salvage looted from a fallen foe. Who spawned the base type? Report this on the github."
|
||||
|
||||
/obj/item/salvage/loot/pirate
|
||||
name = "stolen jewellery"
|
||||
desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture."
|
||||
icon_state = "pirate_treasure"
|
||||
hitsound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
|
||||
|
||||
/obj/item/salvage/loot/russian
|
||||
name = "siosp manual"
|
||||
desc = "A small manual, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Central Command may wish to share this with their allies in the Trans-Solar Federation."
|
||||
icon_state = "ussp_manual"
|
||||
hitsound = 'sound/items/handling/paper_pickup.ogg'
|
||||
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/paper_drop.ogg'
|
||||
|
||||
/obj/item/salvage/loot/syndicate
|
||||
name = "syndicate intel"
|
||||
desc = "A folder detailing Syndicate plans to infiltrate and sabotage operations in the Epsilon Eridani sector. Central Command may find use of this to aid them in counter-intelligence."
|
||||
icon_state = "syndie_doc"
|
||||
hitsound = 'sound/items/handling/paper_pickup.ogg'
|
||||
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
|
||||
drop_sound = 'sound/items/handling/paper_drop.ogg'
|
||||
@@ -1367,6 +1367,12 @@
|
||||
icon_state = "cargotech"
|
||||
toysay = "For Cargonia!"
|
||||
|
||||
/obj/item/toy/figure/crew/explorer
|
||||
name = "\improper Explorer action figure"
|
||||
desc = "The oblivious explorer, from Space Life's SS12 figurine collection."
|
||||
icon_state = "explorer"
|
||||
toysay = "I f-foun-nd-d it-t in-n s-spac-ce!"
|
||||
|
||||
/obj/item/toy/figure/crew/ce
|
||||
name = "\improper Chief Engineer action figure"
|
||||
desc = "The expert Chief Engineer, from Space Life's SS12 figurine collection."
|
||||
|
||||
@@ -254,9 +254,11 @@
|
||||
/obj/item/melee/energy/sword/pirate
|
||||
name = "energy cutlass"
|
||||
desc = "Arrrr matey."
|
||||
force_on = 20
|
||||
icon_state = "cutlass0"
|
||||
icon_state_on = "cutlass1"
|
||||
light_color = LIGHT_COLOR_RED
|
||||
origin_tech = "combat=3;magnets=4;syndicate=2"
|
||||
|
||||
/obj/item/melee/energy/blade
|
||||
name = "energy blade"
|
||||
|
||||
@@ -462,3 +462,28 @@
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
can_hold = list(/obj/item/airlock_electronics, /obj/item/firelock_electronics, /obj/item/firealarm_electronics, /obj/item/apc_electronics, /obj/item/airalarm_electronics, /obj/item/camera_assembly, /obj/item/stock_parts/cell, /obj/item/circuitboard, /obj/item/stack/cable_coil)
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
/*
|
||||
* Treasure bag
|
||||
*/
|
||||
|
||||
/obj/item/storage/bag/expedition
|
||||
name = "treasure satchel"
|
||||
desc = "A satchel for storing scavenged salvage. There be treasure."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "satchel" // placeholder
|
||||
origin_tech = "engineering=2"
|
||||
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 15
|
||||
max_combined_w_class = 60
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
can_hold = list(/obj/item/salvage)
|
||||
|
||||
/obj/item/storage/bag/expedition/robust
|
||||
name = "robust treasure satchel"
|
||||
desc = "We heard you liked booty so we put booty in your booty so ye could carry more booty."
|
||||
storage_slots = 30
|
||||
max_combined_w_class = 120
|
||||
origin_tech = "materials=3;engineering=3"
|
||||
icon_state = "satchel_bspace" // placeholder
|
||||
|
||||
@@ -164,6 +164,21 @@
|
||||
new /obj/item/stack/cable_coil(src, 30, COLOR_RED)
|
||||
update_icon()
|
||||
|
||||
/obj/item/storage/belt/utility/expedition
|
||||
desc = "A belt for holding tools, but with style."
|
||||
icon_state = "assaultbelt"
|
||||
item_state = "assault"
|
||||
|
||||
/obj/item/storage/belt/utility/expedition/populate_contents()
|
||||
new /obj/item/screwdriver(src, "blue")
|
||||
new /obj/item/wrench(src)
|
||||
new /obj/item/weldingtool/hugetank(src)
|
||||
new /obj/item/crowbar(src)
|
||||
new /obj/item/wirecutters(src)
|
||||
new /obj/item/multitool(src)
|
||||
new /obj/item/stack/cable_coil(src, 30, COLOR_BLUE)
|
||||
update_icon()
|
||||
|
||||
/obj/item/storage/belt/medical
|
||||
name = "medical belt"
|
||||
desc = "Can hold various medical equipment."
|
||||
|
||||
@@ -949,6 +949,17 @@
|
||||
return
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/box/relay_kit
|
||||
name = "telecommunications relay kit"
|
||||
desc = "Contains everything you need to set up your own telecommunications array!"
|
||||
|
||||
/obj/item/storage/box/relay_kit/populate_contents()
|
||||
new /obj/item/paper/tcommskey(src)
|
||||
new /obj/item/stack/sheet/metal/(src, 5)
|
||||
new /obj/item/circuitboard/tcomms/relay(src)
|
||||
new /obj/item/stock_parts/manipulator(src)
|
||||
new /obj/item/stock_parts/manipulator(src)
|
||||
new /obj/item/stack/cable_coil(src, 7)
|
||||
|
||||
/obj/item/storage/box/centcomofficer
|
||||
name = "officer kit"
|
||||
|
||||
@@ -298,4 +298,15 @@
|
||||
new /obj/item/clothing/gloves/color/latex/nitrile(src)
|
||||
new /obj/item/clothing/shoes/black(src)
|
||||
|
||||
/obj/item/storage/bag/garment/explorer
|
||||
name = "explorer's garment bag"
|
||||
desc = "A bag for storing extra clothes and shoes. This one belongs to the explorer."
|
||||
|
||||
/obj/item/storage/bag/garment/explorer/populate_contents()
|
||||
new /obj/item/clothing/under/rank/cargo/expedition(src)
|
||||
new /obj/item/clothing/under/rank/cargo/expedition/overalls(src)
|
||||
new /obj/item/clothing/head/soft/expedition(src)
|
||||
new /obj/item/clothing/head/beret/expedition(src)
|
||||
new /obj/item/clothing/gloves/color/black(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/mask/gas/explorer(src)
|
||||
|
||||
@@ -200,6 +200,10 @@
|
||||
machine_name = "CargoDrobe"
|
||||
icon_state = "refill_clothes"
|
||||
|
||||
/obj/item/vending_refill/exploredrobe
|
||||
machine_name = "ExploreDrobe"
|
||||
icon_state = "refill_clothes"
|
||||
|
||||
/obj/item/vending_refill/chefdrobe
|
||||
machine_name = "ChefDrobe"
|
||||
icon_state = "refill_clothes"
|
||||
|
||||
@@ -107,10 +107,11 @@
|
||||
/obj/item/clothing/mask/cigarette/cigar,
|
||||
/obj/item/stack/wrapping_paper,
|
||||
/obj/item/toy/figure/crew/cargotech,
|
||||
/obj/item/toy/figure/crew/explorer,
|
||||
/obj/item/toy/figure/crew/qm,
|
||||
/obj/item/toy/figure/crew/miner,
|
||||
/obj/item/storage/box/scratch_cards)
|
||||
job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner")
|
||||
job_list = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Explorer")
|
||||
|
||||
/obj/item/envelope/medical
|
||||
icon_state = "mail_med"
|
||||
@@ -211,7 +212,7 @@
|
||||
/obj/item/toy/figure/owl,
|
||||
/obj/item/toy/figure/griffin,
|
||||
/obj/item/storage/box/scratch_cards)
|
||||
job_list = list("Assistant", "Explorer")
|
||||
job_list = list("Assistant")
|
||||
|
||||
|
||||
/*//////////////////////\/
|
||||
|
||||
@@ -13,6 +13,24 @@
|
||||
new /obj/item/clothing/head/soft/cargo(src)
|
||||
new /obj/item/storage/bag/mail(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/explorer
|
||||
name = "explorer's locker"
|
||||
req_access = list(ACCESS_EXPEDITION)
|
||||
icon_state = "explorer"
|
||||
open_door_sprite = "mining_door"
|
||||
|
||||
/obj/structure/closet/secure_closet/explorer/populate_contents()
|
||||
new /obj/item/radio/headset/headset_cargo/expedition(src)
|
||||
new /obj/item/gun/energy/kinetic_accelerator/pistol(src)
|
||||
new /obj/item/storage/firstaid/regular(src)
|
||||
new /obj/item/clothing/accessory/holster(src)
|
||||
new /obj/item/radio/beacon(src)
|
||||
new /obj/item/storage/box/relay_kit(src)
|
||||
new /obj/item/gps(src)
|
||||
new /obj/item/storage/bag/ore(src)
|
||||
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
|
||||
new /obj/item/storage/bag/expedition(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/quartermaster
|
||||
name = "quartermaster's locker"
|
||||
req_access = list(ACCESS_QM)
|
||||
|
||||
Reference in New Issue
Block a user