cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Explorer Redux (#24202)

Browse Source 
* 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
2024-05-27 19:27:59 +00:00
committed by GitHub
co-authored by Matt Contrabang Christasmurf warriorstar-orion Henri215 github-actions DGamerL
parent c9f44b1f29
commit 5a68c5f6d3
146 changed files with 5636 additions and 4652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/beret.dm
+13
View File
@@ -156,6 +156,19 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
/obj/item/clothing/head/beret/expedition
name = "expedition beret"
desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same."
icon_state = "beret_expedition"
item_color = "beret_expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 6 SECONDS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
code/modules/clothing/head/job_hats.dm
-1
View File
@@ -194,4 +194,3 @@
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor."
icon_state = "surgcap_black"
dog_fashion = /datum/dog_fashion/head/surgery
code/modules/clothing/head/soft_caps.dm
+10
View File
@@ -117,6 +117,16 @@
"Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi'
)
/obj/item/clothing/head/soft/expedition
name = "expedition cap"
desc = "It's a baseball hat in the brown and blue markings of the expedition team."
icon_state = "expeditionsoft"
item_color = "expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
)
/obj/item/clothing/head/soft/janitorgrey
name = "grey janitor's cap"
desc = "It's a grey baseball hat with a purple custodial shield."
code/modules/clothing/spacesuits/plasmamen.dm
+7
View File
@@ -187,6 +187,13 @@
item_state = "explorer_envirohelm"
visor_icon = "explorer_envisor"
/obj/item/clothing/head/helmet/space/plasmaman/expedition
name = "expedition plasma envirosuit helmet"
desc = "A brown and blue helmet given to plasmaman explorers operating in Space.."
icon_state = "expedition_envirohelm"
item_state = "expedition_envirohelm"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
code/modules/clothing/suits/misc_suits.dm
+61 -1
View File
@@ -305,10 +305,63 @@
icon_state = "carp_casual"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS
/obj/item/clothing/suit/hooded/carp_costume/dragon
name = "space carp poncho"
desc = "A poncho fashioned from the scales of a corrupted space carp, it still smells."
armor = list(MELEE = 30, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|HANDS|FEET
flags = STOPSPRESSUREDMAGE
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
hoodtype = /obj/item/clothing/head/hooded/carp_hood/dragon
/obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial)
. = ..()
if(slot == SLOT_HUD_OUTER_SUIT)
user.faction += "carp"
to_chat(user, "<span class='cult'>You feel a something gnash in the back of your mind- the carp are your friends, not your foe.</span>")
playsound(loc, 'sound/weapons/bite.ogg', 35, TRUE)
/obj/item/clothing/suit/hooded/carp_costume/dragon/dropped(mob/user)
. = ..()
if(user)
user.faction -= "carp"
to_chat(user, "<span class='cult'>A sudden calm fills the gnashing void of your mind- you're alone now.</span>")
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0)
if(..())
return TRUE
if(istype(wear_suit, /obj/item/clothing/suit/hooded/carp_costume/dragon))
return TRUE
//Do we have a working jetpack?
var/obj/item/tank/jetpack/thrust
if(istype(back, /obj/item/tank/jetpack))
thrust = back
else if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
thrust = C.jetpack
else if(ismodcontrol(back))
var/obj/item/mod/control/C = back
thrust = locate(/obj/item/mod/module/jetpack) in C
if(thrust)
if((movement_dir || thrust.stabilizers) && thrust.allow_thrust(0.01, src))
return TRUE
if(dna.species.spec_Process_Spacemove(src))
return TRUE
return FALSE
/obj/item/clothing/head/hooded/carp_hood/dragon
name = "space carp hood"
desc = "Fashioned from the maw of a carp, this outfit makes you feel like a fish out of water."
armor = list(MELEE = 55, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
flags = STOPSPRESSUREDMAGE
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
/obj/item/clothing/suit/hooded/salmon_costume
name = "salmon suit"
desc = "A costume made from authentic salmon scales, it reeks!"
@@ -929,6 +982,13 @@
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/suit/jacket/expeditionbomber
name = "expedition bomber jacket"
desc = "A stylish jacket for station-side explorers. Won't do much to protect you from space."
icon_state = "bomberexpedition"
item_state = "bomberexpedition"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
/obj/item/clothing/suit/jacket/hydrobomber
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
code/modules/clothing/under/jobs/cargo.dm
+22
View File
@@ -77,3 +77,25 @@
icon_state = "explorer"
item_state = "explorer"
item_color = "explorer"
/obj/item/clothing/under/rank/cargo/expedition
name = "expedition jumpsuit"
desc = "An armored brown jumpsuit with Nanotrasen markings for identification, and a black safety harness for their space suits."
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
icon_state = "expedition"
item_state = "expedition"
item_color = "expedition"
/obj/item/clothing/under/rank/cargo/expedition/skirt
name = "expedition jumpskirt"
desc = "An armoured brown jumpskirt with Nanotrasen markings for identification, and a black safety harness for their space suits."
icon_state = "expedition_skirt"
item_state = "expedition_skirt"
item_color = "expedition_skirt"
/obj/item/clothing/under/rank/cargo/expedition/overalls
name = "expedition overalls"
desc = "A black set of overalls over a brown turtleneck, designed to protect the wearer from microscopic space debris. Does not protect against larger objects."
icon_state = "expedition_overalls"
item_state = "expedition_overalls"
item_color = "expedition_overalls"
code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+7
View File
@@ -5,6 +5,13 @@
item_state = "cargo_envirosuit"
item_color = "cargo_envirosuit"
/obj/item/clothing/under/plasmaman/expedition
name = "expedition envirosuit"
desc = "An airtight brown and blue suit designed for operations in Space by plasmamen.."
icon_state = "expedition_envirosuit"
item_state = "expedition_envirosuit"
item_color = "expedition_envirosuit"
/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen."