shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
SandPoot
2024-08-11 14:10:35 -03:00
parent 587f92e900
commit 0fd4dba15b
8 changed files with 215 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/antagonists/cult/cult.dm
View File

@@ -254,7 +254,7 @@
/datum/team/cult
name = "Cult"
var/blood_target
var/atom/blood_target
var/image/blood_target_image
var/blood_target_reset_timer

4
code/modules/antagonists/cult/cult_comms.dm
View File

@@ -363,8 +363,8 @@
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown)
C.cult_team.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
C.cult_team.blood_target_image.pixel_x = -target.pixel_x
C.cult_team.blood_target_image.pixel_y = -target.pixel_y
C.cult_team.blood_target_image.pixel_x = -C.cult_team.blood_target.pixel_x
C.cult_team.blood_target_image.pixel_y = -C.cult_team.blood_target.pixel_y
SEND_SOUND(owner, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
owner.client.images += C.cult_team.blood_target_image
for(var/datum/mind/B in SSticker.mode.cult)

16
code/modules/clothing/chameleon.dm
View File

@@ -212,13 +212,15 @@
UpdateButtons()
/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
target.name = initial(picked_item.name)
target.desc = initial(picked_item.desc)
target.icon_state = initial(picked_item.icon_state)
if(isitem(target))
var/obj/item/I = target
var/obj/item/chameleon_item = target
chameleon_item.name = initial(picked_item.name)
chameleon_item.desc = initial(picked_item.desc)
chameleon_item.icon_state = initial(picked_item.icon_state)
if(isitem(chameleon_item))
var/obj/item/I = chameleon_item
I.item_state = initial(picked_item.item_state)
var/obj/item/clothing/CL = target
var/obj/item/clothing/CL = chameleon_item
var/obj/item/clothing/PCL = new picked_item
if(istype(CL) && istype(PCL))
CL.flags_cover = PCL.flags_cover
@@ -226,7 +228,7 @@
CL.mutantrace_variation = PCL.mutantrace_variation
CL.mob_overlay_icon = PCL.mob_overlay_icon
qdel(PCL)
target.icon = initial(picked_item.icon)
chameleon_item.icon = initial(picked_item.icon)
/datum/action/item_action/chameleon/change/pda/update_item(obj/item/pda/picked_item)
if(!istype(target, /obj/item/pda))

9
code/modules/surgery/dental_implant.dm
View File

@@ -33,10 +33,11 @@
/datum/action/item_action/hands_free/activate_pill/Trigger()
if(!..())
return FALSE
to_chat(owner, "<span class='caution'>You grit your teeth and burst the implanted [target.name]!</span>")
var/obj/item/item_target = target
to_chat(owner, span_notice("You grit your teeth and burst the implanted [item_target.name]!"))
log_combat(owner, null, "swallowed an implanted pill", target)
if(target.reagents.total_volume)
target.reagents.reaction(owner, INGEST)
target.reagents.trans_to(owner, target.reagents.total_volume, log = "dental pill swallow")
if(item_target.reagents.total_volume)
item_target.reagents.reaction(owner, INGEST)
item_target.reagents.trans_to(owner, item_target.reagents.total_volume, log = "dental pill swallow")
qdel(target)
return TRUE