more work

This commit is contained in:
Metis
2024-09-13 01:50:58 -04:00
parent 8fd779ef02
commit 7b0780804f
320 changed files with 12185 additions and 161 deletions
@@ -5,16 +5,16 @@
icon_state = "bluespace_belt"
item_state = "bluespace_belt"
slot_flags = ITEM_SLOT_BELT
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg'
equip_sound = 'GainStation13/sound/items/equip/toolbelt_equip.ogg'
drop_sound = 'GainStation13/sound/items/handling/toolbelt_drop.ogg'
pickup_sound = 'GainStation13/sound/items/handling/toolbelt_pickup.ogg'
/obj/item/bluespace_belt/equipped(mob/user, slot)
..()
if(!iscarbon(user))
return
var/mob/living/carbon/U = user
if(slot == SLOT_BELT)
if(slot ==ITEM_SLOT_BELT)
to_chat(U, "<span class='notice'>You put the belt around your waist and your mass begins to shrink...</span>")
U.hider_add(src)
else
@@ -1,47 +0,0 @@
/obj/item/clothing/accessory/pride_pin
name = "pride pin"
desc = "A pride pin."
icon_state = "pride"
item_color = "pride"
/obj/item/clothing/accessory/pride_pin/bi
name = "bisexual pride pin"
desc = "A bisexual pride pin."
icon_state = "pride_bi"
item_color = "pride_bi"
/obj/item/clothing/accessory/pride_pin/trans
name = "transgender pride pin"
desc = "A transgender pride pin."
icon_state = "pride_trans"
item_color = "pride_trans"
/obj/item/clothing/accessory/pride_pin/ace
name = "asexual pride pin"
desc = "A asexual pride pin."
icon_state = "pride_ace"
item_color = "pride_ace"
/obj/item/clothing/accessory/pride_pin/enby
name = "non-binary pride pin"
desc = "A non-binary pride pin."
icon_state = "pride_enby"
item_color = "pride_enby"
/obj/item/clothing/accessory/pride_pin/pan
name = "pansexual pride pin"
desc = "A pansexual pride pin."
icon_state = "pride_pan"
item_color = "pride_pan"
/obj/item/clothing/accessory/pride_pin/lesbian
name = "lesbian pride pin"
desc = "A lesbian pride pin."
icon_state = "pride_lesbian"
item_color = "pride_lesbian"
/obj/item/clothing/accessory/pride_pin/intersex
name = "intersex pride pin"
desc = "A intersex pride pin."
icon_state = "pride_intersex"
item_color = "pride_intersex"
+2 -2
View File
@@ -1,7 +1,7 @@
/obj/item/gun/fatbeam // GS13
name = "Fatbeam Gun"
desc = "Apparently used to treat malnourished patients from a safe distance... But we all know what it will truly be used for."
icon = 'icons/obj/fatbeam.dmi'
icon = 'GainStation13/icons/obj/weapons/fatbeam.dmi'
icon_state = "fatbeam"
item_state = "fatbeam"
w_class = WEIGHT_CLASS_NORMAL
@@ -41,7 +41,7 @@
on_beam_release(current_target)
current_target = null
/obj/item/gun/fatbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
/obj/item/gun/fatbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stan_cost = 0)
if(isliving(user))
add_fingerprint(user)