mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-29 16:19:36 +01:00
[MIRROR] Kitchen Sink PR (#10745)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
42483a1d4a
commit
667e08ee0a
+3
-17
@@ -80,7 +80,7 @@
|
||||
. = ..()
|
||||
//return QDEL_HINT_HARDDEL_NOW Just keep track of mob references. They delete SO much faster now.
|
||||
|
||||
/mob/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) //CHOMPEdit show_message() moved to /atom/movable
|
||||
/mob/show_message(msg, type, alt, alt_type)
|
||||
|
||||
if(!client && !teleop) return
|
||||
|
||||
@@ -480,7 +480,7 @@
|
||||
|
||||
|
||||
targets += observe_list_format(GLOB.nuke_disks)
|
||||
targets += observe_list_format(GLOB.all_singularities) //CHOMP Edit
|
||||
targets += observe_list_format(GLOB.all_singularities)
|
||||
targets += getmobs()
|
||||
targets += observe_list_format(sortAtom(mechas_list))
|
||||
targets += observe_list_format(SSshuttles.ships)
|
||||
@@ -563,7 +563,7 @@
|
||||
to_chat(src, span_warning("It won't budge!"))
|
||||
return
|
||||
|
||||
if(lying) // CHOMPAdd - No pulling while we crawl.
|
||||
if(lying)
|
||||
return
|
||||
|
||||
var/mob/M = AM
|
||||
@@ -1138,19 +1138,6 @@
|
||||
in_throw_mode = 1
|
||||
if(throw_icon && !issilicon(src)) // Silicon use this for something else. Do not overwrite their HUD icon
|
||||
throw_icon.icon_state = "act_throw_on"
|
||||
/* CHOMPedit removal begin
|
||||
/mob/verb/spacebar_throw_on()
|
||||
set name = ".throwon"
|
||||
set hidden = TRUE
|
||||
set instant = TRUE
|
||||
throw_mode_on()
|
||||
|
||||
/mob/verb/spacebar_throw_off()
|
||||
set name = ".throwoff"
|
||||
set hidden = TRUE
|
||||
set instant = TRUE
|
||||
throw_mode_off()
|
||||
ChompEdit removal end*/
|
||||
/mob/proc/isSynthetic()
|
||||
return 0
|
||||
|
||||
@@ -1175,7 +1162,6 @@ ChompEdit removal end*/
|
||||
var/mob/exploited = exploit_for.resolve()
|
||||
exploited?.exploit_addons -= src
|
||||
exploit_for = null
|
||||
// CHOMPEdit End
|
||||
. = ..()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user