Skip to content

Commit

Permalink
stupid
Browse files Browse the repository at this point in the history
  • Loading branch information
thgvr committed Oct 1, 2024
1 parent 23a8fdb commit c085842
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 71 deletions.
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
15 changes: 0 additions & 15 deletions code/datums/diseases/gastrolisis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,6 @@
"<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()
Expand Down Expand Up @@ -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 @@ -32,7 +32,6 @@
shoes = /obj/item/clothing/shoes/clown_shoes/combat
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
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)
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
1 change: 0 additions & 1 deletion code/modules/clothing/outfits/event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
shoes = /obj/item/clothing/shoes/sneakers/red
suit = /obj/item/clothing/suit/space/santa
head = /obj/item/clothing/head/santa
back = /obj/item/storage/backpack/santabag
r_pocket = /obj/item/flashlight
gloves = /obj/item/clothing/gloves/color/red

Expand Down
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")

0 comments on commit c085842

Please sign in to comment.