mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Revert "Merge pull request #16520 from SabreML/fix-bundle-4"
This reverts commit9a62622fbc, reversing changes made to841ad0f1fd.
This commit is contained in:
@@ -31,6 +31,10 @@
|
||||
update_static_data(owner, ui)
|
||||
. = TRUE
|
||||
|
||||
/datum/orbit_menu/ui_data(mob/user)
|
||||
var/list/data = list()
|
||||
return data
|
||||
|
||||
/datum/orbit_menu/ui_static_data(mob/user)
|
||||
var/list/data = list()
|
||||
|
||||
@@ -92,7 +96,6 @@
|
||||
)
|
||||
if(SSticker && SSticker.mode)
|
||||
other_antags += list(
|
||||
"Blob" = (mind.special_role == SPECIAL_ROLE_BLOB),
|
||||
"Cultist" = (mind in SSticker.mode.cult),
|
||||
"Wizard" = (mind in SSticker.mode.wizards),
|
||||
"Wizard's Apprentice" = (mind in SSticker.mode.apprentices),
|
||||
@@ -118,10 +121,6 @@
|
||||
var/list/antag_serialized = serialized.Copy()
|
||||
antag_serialized["antag"] = "Terror Spider"
|
||||
antagonists += list(antag_serialized)
|
||||
else if(istype(M, /mob/living/simple_animal/revenant))
|
||||
var/list/antag_serialized = serialized.Copy()
|
||||
antag_serialized["antag"] = "Revenant"
|
||||
antagonists += list(antag_serialized)
|
||||
else
|
||||
misc += list(serialized)
|
||||
|
||||
|
||||
@@ -272,8 +272,6 @@
|
||||
* * target - The mob who is currently on fire
|
||||
*/
|
||||
/mob/living/carbon/proc/pat_out(mob/living/target)
|
||||
if(target == src)
|
||||
return // Probably shouldn't be able to pat yourself out.
|
||||
var/self_message = "<span class='warning'>You try to extinguish [target]!</span>"
|
||||
if(prob(30) && ishuman(src)) // 30% chance of burning your hands
|
||||
var/mob/living/carbon/human/H = src
|
||||
|
||||
@@ -170,13 +170,9 @@
|
||||
|
||||
if("growl", "growls")
|
||||
var/M = handle_emote_param(param)
|
||||
if(miming)
|
||||
message = "<B>[src]</B> acts out a growl[M ? " at [M]" : ""]!"
|
||||
m_type = 1
|
||||
else
|
||||
message = "<B>[src]</B> growls[M ? " at [M]" : ""]!"
|
||||
playsound(loc, "growls", 80, 1, frequency = get_age_pitch())
|
||||
m_type = 2
|
||||
message = "<B>[src]</B> growls[M ? " at [M]" : ""]."
|
||||
playsound(loc, "growls", 80, 1, frequency = get_age_pitch())
|
||||
m_type = 2
|
||||
|
||||
if("ping", "pings")
|
||||
var/M = handle_emote_param(param)
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
return 0
|
||||
|
||||
/mob/proc/get_screen_colour()
|
||||
return
|
||||
|
||||
/mob/proc/update_client_colour(time = 10) //Update the mob's client.color with an animation the specified time in length.
|
||||
if(!client) //No client_colour without client. If the player logs back in they'll be back through here anyway.
|
||||
|
||||
Reference in New Issue
Block a user