cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some Tweaks & Fixes For Chameleon Projector (#17719)

Browse Source 
* Minor Grammar Tweaks

* Fixes Some Exploits

* Code Style Tweaks

* Small Refactor

* Changes From Review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
TrashDoxx
2022-05-03 16:31:39 +05:00
committed by GitHub
parent 4efd6f267d
commit e04e0132b6
1 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/chameleonproj.dm
+36 -24
View File
@@ -1,16 +1,16 @@
/obj/item/chameleon
name = "chameleon-projector"
name = "chameleon projector"
icon = 'icons/obj/device.dmi'
icon_state = "shield0"
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "electronic"
throwforce = 5.0
throwforce = 5
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
origin_tech = "syndicate=4;magnets=4"
var/can_use = 1
var/can_use = TRUE
var/obj/effect/dummy/chameleon/active_dummy = null
var/saved_item = /obj/item/cigbutt
var/saved_icon = 'icons/obj/clothing/masks.dmi'
@@ -28,8 +28,15 @@
/obj/item/chameleon/attack_self()
toggle()
/obj/item/chameleon/afterattack(atom/target, mob/user , proximity)
if(!proximity) return
/obj/item/chameleon/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
if(!check_sprite(target))
return
if(target.alpha < 255)
return
if(target.invisibility != 0)
return
if(!active_dummy)
if(istype(target,/obj/item) && !istype(target, /obj/item/disk/nuclear))
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
@@ -40,8 +47,12 @@
saved_overlays = target.overlays
saved_underlays = target.underlays
/obj/item/chameleon/proc/check_sprite(atom/target)
return (target.icon_state in icon_states(target.icon))
/obj/item/chameleon/proc/toggle()
if(!can_use || !saved_item) return
if(!can_use || !saved_item)
return
if(active_dummy)
eject_all()
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
@@ -55,7 +66,8 @@
else
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
var/obj/O = new saved_item(src)
if(!O) return
if(!O)
return
var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src)
qdel(O)
@@ -73,8 +85,8 @@
if(delete_dummy)
qdel(active_dummy)
active_dummy = null
can_use = 0
spawn(50) can_use = 1
can_use = FALSE
addtimer(VARSET_CALLBACK(src, can_use, TRUE), 5 SECONDS)
/obj/item/chameleon/proc/eject_all()
for(var/atom/movable/A in active_dummy)
@@ -86,9 +98,9 @@
/obj/effect/dummy/chameleon
name = ""
desc = ""
density = 0
anchored = 1
var/can_move = 1
density = FALSE
anchored = TRUE
var/can_move = TRUE
var/obj/item/chameleon/master = null
/obj/effect/dummy/chameleon/proc/activate(obj/O, mob/M, new_icon, new_iconstate, new_overlays, new_underlays, obj/item/chameleon/C)
@@ -105,12 +117,12 @@
/obj/effect/dummy/chameleon/attackby()
for(var/mob/M in src)
to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
to_chat(M, "<span class='danger'>Your [src] deactivates.</span>")
master.disrupt()
/obj/effect/dummy/chameleon/attack_hand()
for(var/mob/M in src)
to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
to_chat(M, "<span class='danger'>Your [src] deactivates.</span>")
master.disrupt()
/obj/effect/dummy/chameleon/attack_animal()
@@ -124,34 +136,34 @@
/obj/effect/dummy/chameleon/ex_act(severity) //no longer bomb-proof
for(var/mob/M in src)
to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
to_chat(M, "<span class='danger'>Your [src] deactivates.</span>")
spawn()
M.ex_act(severity)
master.disrupt()
/obj/effect/dummy/chameleon/bullet_act()
for(var/mob/M in src)
to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
to_chat(M, "<span class='danger'>Your [src] deactivates.</span>")
..()
master.disrupt()
/obj/effect/dummy/chameleon/relaymove(mob/user, direction)
if(istype(loc, /turf/space) || !direction)
return //No magical space movement!
if(!isturf(loc) || istype(loc, /turf/space) || !direction)
return // No magical movement!
if(can_move)
can_move = 0
can_move = FALSE
switch(user.bodytemperature)
if(300 to INFINITY)
spawn(10) can_move = 1
addtimer(VARSET_CALLBACK(src, can_move, TRUE), 1 SECONDS)
if(295 to 300)
spawn(13) can_move = 1
addtimer(VARSET_CALLBACK(src, can_move, TRUE), 1.3 SECONDS)
if(280 to 295)
spawn(16) can_move = 1
addtimer(VARSET_CALLBACK(src, can_move, TRUE), 1.6 SECONDS)
if(260 to 280)
spawn(20) can_move = 1
addtimer(VARSET_CALLBACK(src, can_move, TRUE), 2 SECONDS)
else
spawn(25) can_move = 1
addtimer(VARSET_CALLBACK(src, can_move, TRUE), 2.5 SECONDS)
step(src, direction)
return