Revert "THE HONKMOTHER COMES (#9433)" (#9465)

This reverts commit 5e6b4ab3e8.
This commit is contained in:
alexkar598
2020-08-14 21:30:31 -04:00
committed by GitHub
parent 069628f1bb
commit 8a28e5d4fb
28 changed files with 0 additions and 190 deletions

View File

@@ -83,7 +83,6 @@
#define COMSIG_ATOM_RAD_ACT "atom_rad_act" //from base of atom/rad_act(intensity)
#define COMSIG_ATOM_NARSIE_ACT "atom_narsie_act" //from base of atom/narsie_act(): ()
#define COMSIG_ATOM_RATVAR_ACT "atom_ratvar_act" //from base of atom/ratvar_act(): ()
#define COMSIG_ATOM_HONK_ACT "atom_honk_act" //from base of atom/honk_act(): ()
#define COMSIG_ATOM_RCD_ACT "atom_rcd_act" //from base of atom/rcd_act(): (/mob, /obj/item/construction/rcd, passed_mode)
#define COMSIG_ATOM_SING_PULL "atom_sing_pull" //from base of atom/singularity_pull(): (S, current_size)
#define COMSIG_ATOM_SET_LIGHT "atom_set_light" //from base of atom/set_light(): (l_range, l_power, l_color)

View File

@@ -652,14 +652,6 @@
/atom/proc/ratvar_act()
SEND_SIGNAL(src, COMSIG_ATOM_RATVAR_ACT)
/**
* Respond to honkmother eating our atom
*
* Default behaviour is to send COMSIG_ATOM_HONK_ACT and return
*/
/atom/proc/honk_act()
SEND_SIGNAL(src, COMSIG_ATOM_HONK_ACT)
///Return the values you get when an RCD eats you?
/atom/proc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
return FALSE

View File

@@ -33,8 +33,6 @@
return CINEMATIC_NUKE_FAKE
/obj/machinery/nuclearbomb/syndicate/bananium/really_actually_explode(off_station)
//SHE LIVES
new /obj/structure/destructible/honkmother(src.loc)
Cinematic(get_cinematic_type(off_station), world)
for(var/mob/living/carbon/human/H in GLOB.carbon_list)
var/turf/T = get_turf(H)

View File

@@ -157,8 +157,6 @@
else
return ..()
/obj/item/shield/energy/bananium/honk_act()
return FALSE
//BOMBANANA

View File

@@ -1,83 +0,0 @@
//HONK HONK HONK HONK HONK HONK HONK
/obj/structure/destructible/honkmother
name = "The Honkmother"
desc = "HONK!"
icon = 'icons/effects/288x288.dmi'
//Sprite made by MerchantPixels
icon_state = "honkmother"
//Centers Her
pixel_x = -128
pixel_y = -128
//She's immortal! Unkillable! Unmatched!
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
appearance_flags = 0
light_power = 0.7
light_range = 15
//Yellow, the color of bananas!
light_color = "#FFFF000"
//How far things are turned around Her are turned into bananium
var/convert_range = 8
//She is above even fire
layer = RIPPLE_LAYER
obj_flags = CAN_BE_HIT | DANGEROUS_POSSESSION
/obj/structure/destructible/honkmother/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
send_to_playing_players("<span class='clown'>HONK!</span>")
//mine now bitch
sound_to_playing_players('sound/effects/ratvar_reveal.ogg')
var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/items_and_weapons.dmi', "bike_horn")
notify_ghosts("Pranks must be spread to the people! Touch The Honkmother at [get_area_name(src)] and become one of her glorious creations!", null, source = src, alert_overlay = alert_overlay)
/obj/structure/destructible/honkmother/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/structure/destructible/honkmother/attack_ghost(mob/dead/observer/O)
var/alertresult = alert(O, "Become a honking abomination? You can no longer be cloned!",,"Yes", "No")
if(alertresult == "No" || QDELETED(O) || !istype(O) || !O.key)
return FALSE
var/list/L = list(
"clown",
"clown/lube",
"clown/banana",
"clown/afro",
"clown/thin",
"clown/honkling",
"clown/fleshclown",
"clown/longface",
"clown/clownhulk",
"clown/clownhulk/chlown",
"clown/clownhulk/honcmunculus",
"clown/clownhulk/destroyer",
"clown/clownhulk/punisher",
"clown/mutant",
"clown/mutant/blob",
"clown/mutant/thicc")
var/MobType = text2path("/mob/living/simple_animal/hostile/retaliate/[pick(L)]")
var/mob/R = new MobType(get_turf(src))
R.visible_message("<span class='warning'>[R] awakens!</span>")
R.key = O.key
/obj/structure/destructible/honkmother/Bump(atom/A)
var/turf/T = get_turf(A)
if(T == loc)
T = get_step(T, dir) // NOTHING WILL STAND IN THE WAY OF PRANKS
forceMove(T)
//moves and turns things into BANANIUM
/obj/structure/destructible/honkmother/process()
for(var/I in circlerangeturfs(src, convert_range))
var/turf/T = I
if(prob(20))
T.honk_act()
for(var/I in circleviewturfs(src, round(convert_range * 0.5)))
var/turf/T = I
T.honk_act(TRUE)
for(var/O in range(round(convert_range / 1.2), src))
var/obj/T = O
if(prob(20))
T.honk_act()
var/dir_to_step_in = pick(GLOB.cardinals)
step(src, dir_to_step_in)

View File

@@ -386,15 +386,6 @@
A.name = name
qdel(src)
/obj/machinery/door/airlock/honk_act()
var/obj/machinery/door/airlock/bananium/B
if(glass)
B = new/obj/machinery/door/airlock/bananium/glass(get_turf(src))
else
B = new/obj/machinery/door/airlock/bananium(get_turf(src))
B.name = name
qdel(src)
/obj/machinery/door/airlock/Destroy()
QDEL_NULL(wires)
if(charge)

View File

@@ -252,10 +252,6 @@
to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
add_fingerprint(user)
/obj/item/shield/energy/honk_act()
new /obj/item/shield/energy/bananium(src.loc)
qdel(src)
/obj/item/shield/riot/tele
name = "telescopic shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."

View File

@@ -70,11 +70,6 @@
B.setDir(dir)
qdel(src)
/obj/structure/chair/honk_act()
var/obj/structure/chair/bananium/A = new(get_turf(src))
A.setDir(dir)
qdel(src)
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
to_chat(user, "<span class='notice'>You start deconstructing [src]...</span>")

View File

@@ -313,10 +313,6 @@
new mineral_path(T, 2)
qdel(src)
/obj/structure/door_assembly/honk_act()
new /obj/structure/door_assembly/door_assembly_bananium(src.loc)
qdel(src)
/obj/structure/door_assembly/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(the_rcd.mode == RCD_DECONSTRUCT)
return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 16)

View File

@@ -216,9 +216,6 @@
mineral = "bananium"
glass_type = /obj/machinery/door/airlock/bananium/glass
/obj/structure/door_assembly/door_assembly_bananium/honk_act()
return FALSE
/obj/structure/door_assembly/door_assembly_sandstone
name = "sandstone airlock assembly"
icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'

View File

@@ -41,10 +41,6 @@
new /obj/structure/falsewall/brass(loc)
qdel(src)
/obj/structure/falsewall/honk_act()
new /obj/structure/falsewall/bananium(loc)
qdel(src)
/obj/structure/falsewall/attack_hand(mob/user)
if(opening)
return
@@ -272,8 +268,6 @@
walltype = /turf/closed/wall/mineral/bananium
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
/obj/structure/falsewall/bananium/honk_act()
return FALSE
/obj/structure/falsewall/sandstone
name = "sandstone wall"

View File

@@ -48,10 +48,6 @@
new material_drop_type(get_turf(src), drop_amt)
qdel(src)
/obj/structure/statue/honk_act()
new /obj/structure/statue/bananium/clown(src.loc)
qdel(src)
//////////////////////////////////////STATUES/////////////////////////////////////////////////////////////
////////////////////////uranium///////////////////////////////////
@@ -263,9 +259,6 @@
spawn(20)
spam_flag = 0
/obj/structure/statue/bananium/clown/honk_act()
return FALSE
/////////////////////sandstone/////////////////////////////////////////
/obj/structure/statue/sandstone

View File

@@ -60,10 +60,6 @@
new /obj/structure/table_frame/brass(src.loc)
qdel(src)
/obj/structure/table_frame/honk_act()
new /obj/structure/table_frame/bananium(src.loc)
qdel(src)
/*
* Wooden Frames
*/

View File

@@ -85,11 +85,6 @@
qdel(src)
new /obj/structure/table/reinforced/brass(A)
/obj/structure/table/honk_act()
var/atom/A = loc
qdel(src)
new /obj/structure/table/bananium(A)
/obj/structure/table/attack_paw(mob/user)
return attack_hand(user)

View File

@@ -91,13 +91,6 @@
new/obj/structure/window/reinforced/clockwork/fulltile(get_turf(src))
qdel(src)
/obj/structure/window/honk_act()
if(fulltile)
new/obj/structure/window/bananium/fulltile(get_turf(src))
else
return
qdel(src)
/obj/structure/window/singularity_pull(S, current_size)
..()
if(current_size >= STAGE_FIVE)

View File

@@ -221,9 +221,6 @@
if(.)
ChangeTurf(/turf/open/floor/clockwork)
/turf/open/floor/honk_act()
ChangeTurf(/turf/open/floor/mineral/bananium)
/turf/open/floor/acid_melt()
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)

View File

@@ -172,9 +172,6 @@
/turf/open/floor/mineral/bananium/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/bananium/honk_act()
return FALSE
//DIAMOND
/turf/open/floor/mineral/diamond

View File

@@ -42,9 +42,6 @@
sheet_type = /obj/item/stack/sheet/mineral/bananium
canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium)
/turf/closed/wall/mineral/bananium/honk_act()
return FALSE
/turf/closed/wall/mineral/sandstone
name = "sandstone wall"
desc = "A wall with sandstone plating. Rough."

View File

@@ -250,9 +250,6 @@
if(.)
ChangeTurf(/turf/closed/wall/clockwork)
/turf/closed/wall/honk_act()
ChangeTurf(/turf/closed/wall/mineral/bananium)
/turf/closed/wall/get_dumping_location(obj/item/storage/source, mob/user)
return null

View File

@@ -91,11 +91,6 @@
QDEL_NULL(azoom)
return ..()
//ALL GUNS ARE NOW STAFF OF THE HONKMOTHER HONK
/obj/item/gun/honk_act()
new /obj/item/gun/magic/staff/honk(src.loc)
qdel(src)
/obj/item/gun/handle_atom_del(atom/A)
if(A == pin)
pin = null

View File

@@ -72,9 +72,6 @@
max_charges = 4
recharge_rate = 8
/obj/item/gun/magic/staff/honk/honk_act()
return FALSE
/obj/item/gun/magic/staff/spellblade
name = "spellblade"
desc = "A deadly combination of laziness and boodlust, this blade allows the user to dismember their enemies without all the hard work of actually swinging the sword."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 551 KiB

After

Width:  |  Height:  |  Size: 458 KiB

View File

@@ -613,7 +613,6 @@
#include "code\game\gamemodes\clown_ops\bananium_bomb.dm"
#include "code\game\gamemodes\clown_ops\clown_ops.dm"
#include "code\game\gamemodes\clown_ops\clown_weapons.dm"
#include "code\game\gamemodes\clown_ops\honkmother.dm"
#include "code\game\gamemodes\cult\cult.dm"
#include "code\game\gamemodes\devil\devil_game_mode.dm"
#include "code\game\gamemodes\devil\game_mode.dm"

View File

@@ -19,10 +19,6 @@
/obj/item/melee/fryingpan/get_clamped_volume()
return 100 // BONK!
/obj/item/melee/fryingpan/honk_act()
new /obj/item/melee/fryingpan/bananium(src.loc)
qdel(src)
/obj/item/melee/fryingpan/bananium
name = "bananium frying pan"
desc = "A cast-bananium frying pan imbued with an ancient power."
@@ -57,6 +53,3 @@
statue.max_integrity = 9999
statue.obj_integrity = 9999
return ..()
/obj/item/melee/fryingpan/bananium/honk_act()
return FALSE

View File

@@ -8,9 +8,6 @@
buildstacktype = /obj/item/stack/sheet/mineral/bananium
buildstackamount = 2
/obj/structure/chair/bananium/honk_act()
return FALSE
/obj/item/chair/bananium
name = "bananium chair"
icon = 'yogstation/icons/obj/chairs.dmi'

View File

@@ -6,9 +6,6 @@
framestackamount = 2
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/structure/table_frame/bananium/honk_act()
return FALSE
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stack/sheet/mineral/bananium))
var/obj/item/stack/sheet/mineral/bananium/W = I

View File

@@ -31,9 +31,6 @@
spawn(20)
spam_flag = 0
/obj/structure/table/bananium/honk_act()
return FALSE
/obj/structure/rack/skeletal
name = "minibar"
desc = "Different from the Middle Ages version."

View File

@@ -28,9 +28,6 @@
spawn(20)
spam_flag = 0
/obj/structure/window/bananium/honk_act()
return FALSE
/obj/structure/window/bananium/spawner/east
dir = EAST