mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Point Refactor (#10233)
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
c450398bcd
commit
812150cd72
@@ -56,6 +56,9 @@
|
|||||||
* its inherent color, the colored paint applied on it, special color effect etc...
|
* its inherent color, the colored paint applied on it, special color effect etc...
|
||||||
*/
|
*/
|
||||||
var/list/atom_colours
|
var/list/atom_colours
|
||||||
|
/// Lazylist of all images to update when we change z levels
|
||||||
|
/// You will need to manage adding/removing from this yourself, but I'll do the updating for you
|
||||||
|
var/list/image/update_on_z
|
||||||
|
|
||||||
/atom/New(loc, ...)
|
/atom/New(loc, ...)
|
||||||
// Don't call ..() unless /datum/New() ever exists
|
// Don't call ..() unless /datum/New() ever exists
|
||||||
|
|||||||
@@ -657,3 +657,9 @@
|
|||||||
cut_overlay(source)
|
cut_overlay(source)
|
||||||
if(em_block == source)
|
if(em_block == source)
|
||||||
em_block = null
|
em_block = null
|
||||||
|
|
||||||
|
/atom/movable/proc/abstract_move(atom/new_loc)
|
||||||
|
var/atom/old_loc = loc
|
||||||
|
var/direction = get_dir(old_loc, new_loc)
|
||||||
|
loc = new_loc
|
||||||
|
Moved(old_loc, direction, TRUE)
|
||||||
|
|||||||
@@ -60,9 +60,3 @@
|
|||||||
|
|
||||||
/atom/movable/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
|
/atom/movable/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
|
||||||
return
|
return
|
||||||
|
|
||||||
/atom/movable/proc/abstract_move(atom/new_loc)
|
|
||||||
var/atom/old_loc = loc
|
|
||||||
var/direction = get_dir(old_loc, new_loc)
|
|
||||||
loc = new_loc
|
|
||||||
Moved(old_loc, direction, TRUE)
|
|
||||||
|
|||||||
@@ -839,20 +839,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
|||||||
W.add_hiddenprint(src)
|
W.add_hiddenprint(src)
|
||||||
W.visible_message(span_filter_notice(span_red("Invisible fingers crudely paint something in blood on [T]...")))
|
W.visible_message(span_filter_notice(span_red("Invisible fingers crudely paint something in blood on [T]...")))
|
||||||
|
|
||||||
// CHOMPEdit Start - Point Refactor
|
|
||||||
/*
|
|
||||||
/mob/observer/dead/pointed(atom/A as mob|obj|turf in view())
|
|
||||||
if(!..())
|
|
||||||
return 0
|
|
||||||
src.visible_message(span_deadsay(span_bold("[src]") + " points to [A]."))
|
|
||||||
return 1
|
|
||||||
*/
|
|
||||||
|
|
||||||
/mob/observer/dead/_pointed(atom/pointed_at)
|
/mob/observer/dead/_pointed(atom/pointed_at)
|
||||||
if(!..())
|
if(!..())
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
visible_message(span_deadsay("<b>[src]</b> points to [pointed_at]."))
|
visible_message(span_deadsay(span_bold("[src]") + " points to [pointed_at]."))
|
||||||
|
|
||||||
/mob/observer/dead/proc/manifest(mob/user)
|
/mob/observer/dead/proc/manifest(mob/user)
|
||||||
is_manifest = TRUE
|
is_manifest = TRUE
|
||||||
|
|||||||
@@ -114,18 +114,11 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
//mob verbs are faster than object verbs. See above.
|
//mob verbs are faster than object verbs. See above.
|
||||||
// CHOMPEdit Start - Point refactor
|
|
||||||
/mob/living/pointed(atom/A as mob|obj|turf in view(client.view, src))
|
/mob/living/pointed(atom/A as mob|obj|turf in view(client.view, src))
|
||||||
if(src.stat || src.restrained())
|
if(src.stat || src.restrained())
|
||||||
return FALSE
|
return FALSE
|
||||||
if(src.status_flags & FAKEDEATH)
|
if(src.status_flags & FAKEDEATH)
|
||||||
return FALSE
|
return FALSE
|
||||||
/*
|
|
||||||
if(!..())
|
|
||||||
return 0
|
|
||||||
|
|
||||||
usr.visible_message(span_filter_notice(span_bold("[src]") + " points to [A]."))
|
|
||||||
*/
|
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/mob/living/_pointed(atom/pointing_at)
|
/mob/living/_pointed(atom/pointing_at)
|
||||||
@@ -133,7 +126,6 @@
|
|||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
visible_message(span_info(span_bold("[src]") + " points at [pointing_at]."), span_info("You point at [pointing_at]."))
|
visible_message(span_info(span_bold("[src]") + " points at [pointing_at]."), span_info("You point at [pointing_at]."))
|
||||||
// CHOMPEdit End
|
|
||||||
|
|
||||||
/mob/living/verb/succumb()
|
/mob/living/verb/succumb()
|
||||||
set name = "Succumb to death"
|
set name = "Succumb to death"
|
||||||
|
|||||||
@@ -250,37 +250,6 @@
|
|||||||
client.perspective = EYE_PERSPECTIVE
|
client.perspective = EYE_PERSPECTIVE
|
||||||
client.eye = loc
|
client.eye = loc
|
||||||
return TRUE
|
return TRUE
|
||||||
/* CHOMPEdit - Moved to modular_chomp/modules/point/point.dm
|
|
||||||
/mob/verb/pointed(atom/A as mob|obj|turf in view())
|
|
||||||
set name = "Point To"
|
|
||||||
set category = "Object"
|
|
||||||
|
|
||||||
if(!src || !isturf(loc) || !(A in view(loc)))
|
|
||||||
return 0
|
|
||||||
if(istype(A, /obj/effect/decal/point))
|
|
||||||
return 0
|
|
||||||
|
|
||||||
var/turf/tile = get_turf(A)
|
|
||||||
if (!tile)
|
|
||||||
return 0
|
|
||||||
|
|
||||||
var/turf/our_tile = get_turf(src)
|
|
||||||
var/obj/visual = new /obj/effect/decal/point(our_tile)
|
|
||||||
visual.invisibility = invisibility
|
|
||||||
visual.plane = ABOVE_PLANE
|
|
||||||
visual.layer = FLY_LAYER
|
|
||||||
|
|
||||||
animate(visual,
|
|
||||||
pixel_x = (tile.x - our_tile.x) * world.icon_size + A.pixel_x,
|
|
||||||
pixel_y = (tile.y - our_tile.y) * world.icon_size + A.pixel_y,
|
|
||||||
time = 1.7,
|
|
||||||
easing = EASE_OUT)
|
|
||||||
|
|
||||||
QDEL_IN(visual, 2 SECONDS) //Better qdel
|
|
||||||
|
|
||||||
face_atom(A)
|
|
||||||
return 1
|
|
||||||
*/
|
|
||||||
|
|
||||||
/mob/proc/ret_grab(list/L, flag)
|
/mob/proc/ret_grab(list/L, flag)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
/atom/movable/proc/create_point_bubble(atom/pointed_atom)
|
/atom/movable/proc/create_point_bubble(atom/pointed_atom)
|
||||||
var/mutable_appearance/thought_bubble = mutable_appearance(
|
var/mutable_appearance/thought_bubble = mutable_appearance(
|
||||||
'modular_chomp/icons/effects/effects.dmi',
|
'icons/effects/effects.dmi',
|
||||||
"thought_bubble",
|
"thought_bubble",
|
||||||
plane = PLANE_RUNECHAT,
|
plane = PLANE_RUNECHAT,
|
||||||
appearance_flags = KEEP_APART,
|
appearance_flags = KEEP_APART,
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
/atom
|
|
||||||
|
|
||||||
/// Lazylist of all images to update when we change z levels
|
|
||||||
/// You will need to manage adding/removing from this yourself, but I'll do the updating for you
|
|
||||||
var/list/image/update_on_z
|
|
||||||
@@ -184,8 +184,8 @@
|
|||||||
#include "code\__defines\dcs\signals.dm"
|
#include "code\__defines\dcs\signals.dm"
|
||||||
#include "code\__defines\dcs\signals_ch.dm"
|
#include "code\__defines\dcs\signals_ch.dm"
|
||||||
#include "code\__defines\dcs\signals\signals_subsystem.dm"
|
#include "code\__defines\dcs\signals\signals_subsystem.dm"
|
||||||
|
#include "code\__defines\dcs\signals\signals_mobs\signals_mob_main.dm"
|
||||||
#include "code\__defines\dcs\signals\signals_turf.dm"
|
#include "code\__defines\dcs\signals\signals_turf.dm"
|
||||||
#include "code\__defines\dcs\signals_ch\signals_mob\signals_mob_main_ch.dm"
|
|
||||||
#include "code\__defines\traits\_traits.dm"
|
#include "code\__defines\traits\_traits.dm"
|
||||||
#include "code\__defines\traits\declarations.dm"
|
#include "code\__defines\traits\declarations.dm"
|
||||||
#include "code\__defines\traits\sources.dm"
|
#include "code\__defines\traits\sources.dm"
|
||||||
@@ -3997,6 +3997,7 @@
|
|||||||
#include "code\modules\planet\virgo4_vr.dm"
|
#include "code\modules\planet\virgo4_vr.dm"
|
||||||
#include "code\modules\planet\weather.dm"
|
#include "code\modules\planet\weather.dm"
|
||||||
#include "code\modules\player_tips_vr\player_tips_controller_vr.dm"
|
#include "code\modules\player_tips_vr\player_tips_controller_vr.dm"
|
||||||
|
#include "code\modules\point\point.dm"
|
||||||
#include "code\modules\power\apc.dm"
|
#include "code\modules\power\apc.dm"
|
||||||
#include "code\modules\power\batteryrack.dm"
|
#include "code\modules\power\batteryrack.dm"
|
||||||
#include "code\modules\power\batteryrack_vr.dm"
|
#include "code\modules\power\batteryrack_vr.dm"
|
||||||
@@ -4799,7 +4800,6 @@
|
|||||||
#include "modular_chomp\code\datums\supplypacks\supply.dm"
|
#include "modular_chomp\code\datums\supplypacks\supply.dm"
|
||||||
#include "modular_chomp\code\datums\underwear\socks.dm"
|
#include "modular_chomp\code\datums\underwear\socks.dm"
|
||||||
#include "modular_chomp\code\datums\uplink\stealthy_weapons.dm"
|
#include "modular_chomp\code\datums\uplink\stealthy_weapons.dm"
|
||||||
#include "modular_chomp\code\game\atoms\atoms.dm"
|
|
||||||
#include "modular_chomp\code\game\gamemodes\meteor\meteors.dm"
|
#include "modular_chomp\code\game\gamemodes\meteor\meteors.dm"
|
||||||
#include "modular_chomp\code\game\jobs\job\captain.dm"
|
#include "modular_chomp\code\game\jobs\job\captain.dm"
|
||||||
#include "modular_chomp\code\game\jobs\job\department.dm"
|
#include "modular_chomp\code\game\jobs\job\department.dm"
|
||||||
@@ -5092,7 +5092,6 @@
|
|||||||
#include "modular_chomp\code\modules\planet\tyr.dm"
|
#include "modular_chomp\code\modules\planet\tyr.dm"
|
||||||
#include "modular_chomp\code\modules\planet\smokestar\turf.dm"
|
#include "modular_chomp\code\modules\planet\smokestar\turf.dm"
|
||||||
#include "modular_chomp\code\modules\player_tips\player_tips_list.dm"
|
#include "modular_chomp\code\modules\player_tips\player_tips_list.dm"
|
||||||
#include "modular_chomp\code\modules\point\point.dm"
|
|
||||||
#include "modular_chomp\code\modules\power\cells\device_cells.dm"
|
#include "modular_chomp\code\modules\power\cells\device_cells.dm"
|
||||||
#include "modular_chomp\code\modules\power\cells\esoteric_cells.dm"
|
#include "modular_chomp\code\modules\power\cells\esoteric_cells.dm"
|
||||||
#include "modular_chomp\code\modules\power\cells\power_cells.dm"
|
#include "modular_chomp\code\modules\power\cells\power_cells.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user