Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some backpack sprites for Kepori #3430

Merged
merged 10 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@
"kj" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/storage/backpack/magspear_quiver,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
Expand Down Expand Up @@ -1051,7 +1050,6 @@
"PB" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/storage/backpack/magspear_quiver,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/species_clothing_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

///KEPORI PATHS
#define KEPORI_UNIFORM_PATH 'icons/mob/species/kepori/onmob_uniform_kepori.dmi'
#define KEPORI_BACK_PATH 'icons/mob/species/kepori/onmob_back_kepori.dmi'
#define KEPORI_SHOES_PATH 'icons/mob/species/kepori/onmob_feet_kepori.dmi'
#define KEPORI_SUIT_PATH 'icons/mob/species/kepori/onmob_suit_kepori.dmi'
#define KEPORI_EARS_PATH 'icons/mob/species/kepori/onmob_ears_kepori.dmi'
Expand Down
17 changes: 1 addition & 16 deletions code/datums/diseases/gastrolisis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,13 @@
"<span class='userdanger'>You scream in pain as your eyes are pushed out by your new snail eyes!</span>")
affected_mob.emote("scream")
return
var/obj/item/shell = affected_mob.get_item_by_slot(ITEM_SLOT_BACK)
if(!istype(shell, /obj/item/storage/backpack/snail))
shell = null
if(!shell && prob(5))
if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(ITEM_SLOT_BACK)))
affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), ITEM_SLOT_BACK)
affected_mob.visible_message("<span class='warning'>[affected_mob] grows a grotesque shell on their back!</span>", \
"<span class='userdanger'>You scream in pain as a shell pushes itself out from under your skin!</span>")
affected_mob.emote("scream")
return
var/obj/item/organ/tongue/tongue = locate(/obj/item/organ/tongue/snail) in affected_mob.internal_organs
if(!tongue && prob(5))
var/obj/item/organ/tongue/snail/new_tongue = new()
new_tongue.Insert(affected_mob)
to_chat(affected_mob, "<span class='userdanger'>You feel your speech slow down...</span>")
return
if(shell && eyes && tongue && prob(5))
if(eyes && tongue && prob(5))
affected_mob.set_species(/datum/species/snail)
affected_mob.client?.give_award(/datum/award/achievement/misc/snail, affected_mob)
affected_mob.visible_message("<span class='warning'>[affected_mob] turns into a snail!</span>", \
Expand All @@ -79,8 +69,3 @@
if(eyes)
var/obj/item/organ/eyes/new_eyes = new H.dna.species.mutanteyes ()
new_eyes.Insert(H)
var/obj/item/storage/backpack/bag = H.get_item_by_slot(ITEM_SLOT_BACK)
if(istype(bag, /obj/item/storage/backpack/snail))
bag.emptyStorage()
H.temporarilyRemoveItemFromInventory(bag, TRUE)
qdel(bag)
1 change: 0 additions & 1 deletion code/game/gamemodes/clown_ops/clown_ops.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
uniform = /obj/item/clothing/under/syndicate
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/clown
ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
r_pocket = /obj/item/bikehorn
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/supports_variations = null

///If set, kepori wearing this use this instead of their clothing file
var/kepoi_override_icon

var/kepori_override_icon
///If set, vox wearing this use this instead of their clothing file
var/vox_override_icon

Expand Down
20 changes: 0 additions & 20 deletions code/game/objects/items/pneumaticCannon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -326,23 +326,3 @@
/obj/item/pneumatic_cannon/speargun/Initialize()
. = ..()
allowed_typecache = magspear_typecache

/obj/item/storage/backpack/magspear_quiver
name = "quiver"
desc = "A quiver for holding magspears."
icon_state = "quiver"
item_state = "quiver"

/obj/item/storage/backpack/magspear_quiver/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 20
STR.max_combined_w_class = 40
STR.display_numerical_stacking = TRUE
STR.set_holdable(list(
/obj/item/throwing_star/magspear
))

/obj/item/storage/backpack/magspear_quiver/PopulateContents()
for(var/i in 1 to 20)
new /obj/item/throwing_star/magspear(src)
55 changes: 5 additions & 50 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
desc = "You wear this on your back and put items into it."
icon_state = "backpack"
item_state = "backpack"
icon = 'icons/obj/clothing/back/backpacks.dmi'
mob_overlay_icon = 'icons/mob/clothing/back/backpacks.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
pickup_sound = "rustle"
Expand All @@ -26,7 +28,9 @@
max_integrity = 300
greyscale_icon_state = "backpack"
greyscale_colors = list(list(13, 17), list(12, 17), list(12, 21))
supports_variations = VOX_VARIATION

supports_variations = VOX_VARIATION | KEPORI_VARIATION
kepori_override_icon = 'icons/mob/clothing/back/backpacks_kepori.dmi'

/obj/item/storage/backpack/ComponentInitialize()
. = ..()
Expand Down Expand Up @@ -61,51 +65,12 @@
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
STR.max_volume = STORAGE_VOLUME_BAG_OF_HOLDING

/obj/item/storage/backpack/santabag
name = "Santa's Gift Bag"
desc = "Space Santa uses this to deliver presents to all the nice children in space in Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state = "giftbag"
w_class = WEIGHT_CLASS_BULKY

/obj/item/storage/backpack/santabag/Initialize()
. = ..()
regenerate_presents()

/obj/item/storage/backpack/santabag/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.max_combined_w_class = 60

/obj/item/storage/backpack/santabag/proc/regenerate_presents()
addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS)

var/mob/M = get(loc, /mob)
if(!istype(M))
return
if(M.mind && HAS_TRAIT(M.mind, TRAIT_CANNOT_OPEN_PRESENTS))
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
var/turf/floor = get_turf(src)
var/obj/item/I = new /obj/item/a_gift/anything(floor)
if(STR.can_be_inserted(I, stop_messages=TRUE))
STR.handle_item_insertion(I, prevent_warning=TRUE)
else
qdel(I)


/obj/item/storage/backpack/cultpack
name = "trophy rack"
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
item_state = "backpack"

/obj/item/storage/backpack/clown
name = "Giggles von Honkerton"
desc = "It's a backpack made by Honk! Co."
icon_state = "clownpack"
item_state = "clownpack"

/obj/item/storage/backpack/explorer
name = "explorer bag"
desc = "A robust backpack for stashing your loot."
Expand Down Expand Up @@ -215,7 +180,6 @@
item_state = "satchel-norm"
greyscale_icon_state = "satchel"
greyscale_colors = list(list(11, 12), list(17, 18), list(10, 11))
supports_variations = VOX_VARIATION

/obj/item/storage/backpack/satchel/ComponentInitialize()
. = ..()
Expand All @@ -226,7 +190,6 @@
/obj/item/storage/backpack/satchel/leather
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
icon = 'icons/obj/storage.dmi'
icon_state = "satchel"
item_state = "satchel"

Expand Down Expand Up @@ -261,12 +224,6 @@
icon_state = "satchel-chem"
item_state = "satchel-chem"

/obj/item/storage/backpack/satchel/gen
name = "geneticist satchel"
desc = "A sterile satchel with geneticist colours."
icon_state = "satchel-gen"
item_state = "satchel-gen"

/obj/item/storage/backpack/satchel/tox
name = "scientist satchel"
desc = "Useful for holding research materials."
Expand Down Expand Up @@ -354,8 +311,6 @@
/obj/item/storage/backpack/messenger
name = "messenger bag"
desc = "A sturdy backpack worn over one shoulder."
icon = 'icons/obj/storage.dmi'
mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "courierbag"
item_state = "courierbag"
greyscale_icon_state = "satchel"
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@

if("white_whale_holy_grail") //Unique items that don't appear anywhere else
new /obj/item/pneumatic_cannon/speargun(src)
new /obj/item/storage/backpack/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src)
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,
/obj/item/storage/backpack/satchel/gen = 2)
/obj/item/storage/backpack/genetics = 2)
generate_items_inside(items_inside,src)
return

Expand Down
4 changes: 0 additions & 4 deletions code/modules/antagonists/santa/santa.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@

/datum/antagonist/santa/proc/give_equipment()
var/mob/living/carbon/human/H = owner.current
if(istype(H))
H.equipOutfit(/datum/outfit/santa)
H.dna.update_dna_identity()

owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport/santa)

/datum/antagonist/santa/proc/give_objective()
Expand Down
26 changes: 0 additions & 26 deletions code/modules/clothing/outfits/event.dm

This file was deleted.

2 changes: 0 additions & 2 deletions code/modules/jobs/job_types/clown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@

implants = list(/obj/item/implant/sad_trombone)

backpack = /obj/item/storage/backpack/clown
satchel = /obj/item/storage/backpack/clown
duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel

box = /obj/item/storage/box/hug/survival
Expand Down
1 change: 0 additions & 1 deletion code/modules/jobs/job_types/geneticist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
l_pocket = /obj/item/sequence_scanner

backpack = /obj/item/storage/backpack/genetics
satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/med

31 changes: 0 additions & 31 deletions code/modules/mob/living/carbon/human/species_types/snail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
siemens_coeff = 2 //snails are mostly water
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP
sexes = FALSE //snails are hermaphrodites
var/shell_type = /obj/item/storage/backpack/snail

mutanteyes = /obj/item/organ/eyes/snail
mutanttongue = /obj/item/organ/tongue/snail
Expand Down Expand Up @@ -41,38 +40,8 @@

/datum/species/snail/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
if(!istype(bag, /obj/item/storage/backpack/snail))
if(C.dropItemToGround(bag)) //returns TRUE even if its null
C.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(C), ITEM_SLOT_BACK)
C.AddElement(/datum/element/snailcrawl)

/datum/species/snail/on_species_loss(mob/living/carbon/C)
. = ..()
C.RemoveElement(/datum/element/snailcrawl)
var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
if(istype(bag, /obj/item/storage/backpack/snail))
bag.emptyStorage()
C.temporarilyRemoveItemFromInventory(bag, TRUE)
qdel(bag)

/obj/item/storage/backpack/snail
name = "snail shell"
desc = "Worn by snails as armor and storage compartment."
icon_state = "snailshell"
item_state = "snailshell"
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
max_integrity = 200
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/storage/backpack/snail/dropped(mob/user, silent)
. = ..()
emptyStorage()
if(!QDELETED(src))
qdel(src)

/obj/item/storage/backpack/snail/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, "snailshell")
Loading
Loading