cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-08 06:14:36 +01:00
parent e694c3938b a93527a23e
commit 4f179299b7
58 changed files with 600 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+49 -68
View File
@@ -12,24 +12,49 @@
attack_verb = list("whipped", "lashed", "disciplined")
drop_sound = 'sound/items/drop/toolbelt.ogg'
pickup_sound = 'sound/items/pickup/toolbelt.ogg'
var/flipped = FALSE
var/show_above_suit = FALSE
var/show_above_suit = 0
/obj/item/storage/belt/proc/update_clothing_icon()
if(ismob(src.loc))
var/mob/M = src.loc
M.update_inv_belt()
/obj/item/storage/belt/verb/toggle_layer()
set name = "Switch Belt Layer"
set category = "Object"
if(show_above_suit == -1)
to_chat(usr, "<span class='notice'>\The [src] cannot be worn above your suit!</span>")
to_chat(usr, SPAN_NOTICE("\The [src] cannot be worn above your suit!"))
return
show_above_suit = !show_above_suit
update_icon()
update_clothing_icon()
/obj/item/storage/update_icon()
if (ismob(src.loc))
var/mob/M = src.loc
M.update_inv_belt()
/obj/item/storage/belt/Initialize()
..()
update_flip_verb()
/obj/item/storage/belt/proc/update_flip_verb()
if(("[initial(icon_state)]_flip") in icon_states(icon)) // Check for whether it has a flipped icon. Prevents invisible sprites.
verbs += /obj/item/storage/belt/proc/flipbelt
/obj/item/storage/belt/proc/flipbelt(mob/user, var/self = TRUE)
set category = "Object"
set name = "Flip Belt"
set src in usr
if(self)
if(use_check_and_message(user))
return
else
if(use_check_and_message(user, self ? USE_ALLOW_NON_ADJACENT : 0))
return
flipped = !flipped
icon_state = "[initial(icon_state)][flipped ? "_flip" : ""]"
item_state = icon_state
to_chat(usr, SPAN_NOTICE("You change \the [src] to be [src.flipped ? "behind" : "in front of"] you."))
update_clothing_icon()
/obj/item/storage/belt/utility
name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
@@ -194,7 +219,7 @@
item_state = "champion"
storage_slots = 1
can_hold = list(
"/obj/item/clothing/mask/luchador"
/obj/item/clothing/mask/luchador
)
/obj/item/storage/belt/security/tactical
@@ -413,29 +438,23 @@
)
/obj/item/storage/belt/fannypack
name = "leather fannypack"
name = "fannypack"
desc = "A dorky fannypack for keeping small items in."
icon = 'icons/clothing/belts/fannypacks.dmi'
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
icon_state = "fannypack"
item_state = "fannypack"
max_w_class = ITEMSIZE_SMALL
contained_sprite = TRUE
storage_slots = null
max_storage_space = 8
var/flipped = FALSE
/obj/item/storage/belt/fannypack/verb/ToggleFanny()
set name = "Adjust Fannypack"
set category = "Object"
set src in usr
/obj/item/storage/belt/fannypack/recolorable
icon_state = "fannypack_colorable"
item_state = "fannypack_colorable"
if(use_check_and_message(usr))
return 0
flipped = !flipped
item_state = "[initial(icon_state)][flipped ? "_flipped" : ""]"
to_chat(usr, "You flip the belt [flipped ? "behind you" : "infront of you"].")
update_icon()
/obj/item/storage/belt/fannypack/recolorable/random/Initialize()
. = ..()
color = get_random_colour(TRUE)
/obj/item/storage/belt/fannypack/component
name = "component pouch"
@@ -443,51 +462,6 @@
starts_with = list(/obj/item/toy/snappop/syndi = 3, /obj/item/reagent_containers/glass/beaker/vial/random/toxin = 2, /obj/item/storage/pill_bottle/dice = 1)
max_storage_space = 14
/obj/item/storage/belt/fannypack/black
name = "black fannypack"
icon_state = "fannypack_black"
item_state = "fannypack_black"
/obj/item/storage/belt/fannypack/blue
name = "blue fannypack"
icon_state = "fannypack_blue"
item_state = "fannypack_blue"
/obj/item/storage/belt/fannypack/cyan
name = "cyan fannypack"
icon_state = "fannypack_cyan"
item_state = "fannypack_cyan"
/obj/item/storage/belt/fannypack/green
name = "green fannypack"
icon_state = "fannypack_green"
item_state = "fannypack_green"
/obj/item/storage/belt/fannypack/orange
name = "orange fannypack"
icon_state = "fannypack_orange"
item_state = "fannypack_orange"
/obj/item/storage/belt/fannypack/purple
name = "purple fannypack"
icon_state = "fannypack_purple"
item_state = "fannypack_purple"
/obj/item/storage/belt/fannypack/red
name = "red fannypack"
icon_state = "fannypack_red"
item_state = "fannypack_red"
/obj/item/storage/belt/fannypack/white
name = "white fannypack"
icon_state = "fannypack_white"
item_state = "fannypack_white"
/obj/item/storage/belt/fannypack/yellow
name = "yellow fannypack"
icon_state = "fannypack_yellow"
item_state = "fannypack_yellow"
/obj/item/storage/belt/shumaila_buckle
name = "hammer buckle belt"
desc = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila."
@@ -501,3 +475,10 @@
Holy Village's most important buildings. When Mata'ke's original hunting party had done battle with the King of Rraknarr, her beloved was killed in the fighting. Ever since then \
she has resolved to be eternally chaste in dedication to him. She is an M'sai who is depicted wearing modest dresses and carrying a hammer on a belt. She is not known for having \
much combat prowess despite her position as head of the town watch but is a capable commander for defensive tactics."
/obj/item/storage/belt/generic
name = "belt"
desc = "Only useful for holding up your pants." // Useless belt is useless.
icon_state = "belt"
item_state = "belt"
storage_slots = 0
code/game/objects/random/random.dm
+4 -2
View File
@@ -743,7 +743,8 @@
/obj/item/gun/energy/rifle/laser/xray,
/obj/item/gun/energy/net,
/obj/item/gun/energy/laser/shotgun,
/obj/item/gun/energy/decloner
/obj/item/gun/energy/decloner,
/obj/item/gun/energy/freeze
)
/obj/random/colored_jumpsuit
@@ -1612,7 +1613,8 @@
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
/obj/item/gun/projectile/automatic/rifle/adhomian = 1,
/obj/item/gun/projectile/musket = 0.5,
/obj/item/gun/launcher/grenade = 1
/obj/item/gun/launcher/grenade = 1,
/obj/item/gun/energy/freeze = 0.5
)
var/list/Epic = list(
code/game/objects/structures/crates_lockers/closets/statue.dm
+41 -13
View File
@@ -44,19 +44,7 @@
health = L.health + 300 //stoning damaged mobs will result in easier to shatter statues
L.frozen = TRUE
appearance = L
dir = L.dir
color = list(
0.30, 0.3, 0.25,
0.30, 0.3, 0.25,
0.30, 0.3, 0.25
)
name = "statue of [L.name]"
desc = "An incredibly lifelike stone carving."
if(iscorgi(L))
name = "statue of a corgi"
desc = "If it takes forever, I will wait for you..."
create_icon(L)
var/mob/statue_mob/temporarymob = new (src)
temporarymob.forceMove(src)
@@ -85,6 +73,21 @@
/obj/structure/closet/statue/content_info()
return
/obj/structure/closet/statue/proc/create_icon(var/mob/living/L)
appearance = L
dir = L.dir
color = list(
0.30, 0.3, 0.25,
0.30, 0.3, 0.25,
0.30, 0.3, 0.25
)
name = "statue of [L.name]"
desc = "An incredibly lifelike stone carving."
if(iscorgi(L))
name = "statue of a corgi"
desc = "If it takes forever, I will wait for you..."
/obj/structure/closet/statue/dump_contents()
for(var/obj/O in src)
@@ -164,3 +167,28 @@
dump_contents()
visible_message("<span class='warning'>[src] shatters!.</span>")
qdel(src)
/obj/structure/closet/statue/ice
name = "ice cube"
desc = "A large ice cube."
anchored = FALSE
/obj/structure/closet/statue/ice/create_icon(var/mob/living/L)
appearance = L
dir = L.dir
var/image/I
I = image(icon = 'icons/obj/statue.dmi', icon_state = "icecube")
add_overlay(I)
/obj/structure/closet/statue/ice/shatter(mob/user as mob)
if (user)
user.frozen = FALSE
if(isliving(user))
var/mob/living/L = user
L.adjustBruteLoss(30)
L.bodytemperature -= 150
dump_contents()
visible_message("<span class='warning'>\The [src] shatters!</span>")
qdel(src)