mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +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:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user