diff --git a/aurorastation.dme b/aurorastation.dme index 67db7cab5a6..02d67215d36 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -370,7 +370,6 @@ #include "code\game\antagonist\antagonist_update.dm" #include "code\game\antagonist\alien\borer.dm" #include "code\game\antagonist\alien\xenomorph.dm" -#include "code\game\antagonist\outsider\actors.dm" #include "code\game\antagonist\outsider\commando.dm" #include "code\game\antagonist\outsider\deathsquad.dm" #include "code\game\antagonist\outsider\ert.dm" diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index b1707e9b8c0..4ecc4bd831d 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -35,7 +35,6 @@ #define MODE_COMMANDO "commando" #define MODE_DEATHSQUAD "deathsquad" #define MODE_ERT "ert" -#define MODE_ACTOR "actor" #define MODE_MERCENARY "mercenary" #define MODE_NINJA "ninja" #define MODE_RAIDER "raider" diff --git a/code/game/antagonist/outsider/actors.dm b/code/game/antagonist/outsider/actors.dm deleted file mode 100644 index 152419dcfed..00000000000 --- a/code/game/antagonist/outsider/actors.dm +++ /dev/null @@ -1,62 +0,0 @@ -var/datum/antagonist/actor/actor - -/datum/antagonist/actor - id = MODE_ACTOR - bantype = "actor" - role_text = "NanoTrasen Actor" - role_text_plural = "NanoTrasen Actors" - welcome_text = "You've been hired to entertain people through the power of television!" - landmark_id = "ActorSpawn" - id_type = /obj/item/weapon/card/id/syndicate - - flags = ANTAG_OVERRIDE_JOB | ANTAG_SET_APPEARANCE | ANTAG_CHOOSE_NAME - - hard_cap = 7 - hard_cap_round = 10 - initial_spawn_req = 1 - initial_spawn_target = 1 - -/datum/antagonist/actor/New() - ..() - actor = src - -/datum/antagonist/actor/greet(var/datum/mind/player) - if(!..()) - return - - player.current.show_message("You work for [current_map.company_name], tasked with the production and broadcasting of entertainment to all of its assets.") - player.current.show_message("Entertain the crew! Try not to disrupt them from their work too much and remind them how great [current_map.company_name] is!") - -/datum/antagonist/actor/equip(var/mob/living/carbon/human/player) - player.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), slot_w_uniform) - player.equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon(src), slot_shoes) - player.equip_to_slot_or_del(new /obj/item/device/radio/headset/entertainment(src), slot_l_ear) - var/obj/item/weapon/card/id/centcom/ERT/C = new(player.loc) - C.assignment = "Actor" - player.set_id_info(C) - player.equip_to_slot_or_del(C,slot_wear_id) - - return 1 - -/* -/client/verb/join_as_actor() - set category = "IC" - set name = "Join as Actor" - set desc = "Join as an Actor to entertain the crew through television!" - - if(!MayRespawn(1)) - return - - var/choice = alert("Are you sure you'd like to join as an actor?", "Confirmation","Yes", "No") - if(choice != "Yes") - return - - if(istype(usr,/mob/abstract/observer) || istype(usr,/mob/abstract/new_player)) - if(actor.current_antagonists.len >= actor.hard_cap) - usr << "No more actors may spawn at the current time." - return - actor.create_default(usr) - return - - usr << "You must be observing or be a new player to spawn as an actor." - */ diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index f7621057ecc..b4ba13f4c3f 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -721,36 +721,6 @@ ) //everything after the power cell had no amounts, I improvised. -Sayu -//FOR ACTORS GUILD - mainly props that cannot be spawned otherwise -/obj/machinery/vending/props - name = "prop dispenser" - desc = "All the props an actor could need. Probably." - icon_state = "Theater" - vend_id = "baygay" - products = list( - /obj/structure/flora/pottedplant = 2, - /obj/item/device/flashlight/lamp = 2, - /obj/item/device/flashlight/lamp/green = 2, - /obj/item/weapon/reagent_containers/food/drinks/jar = 1, - /obj/item/weapon/nullrod = 1, - /obj/item/toy/cultsword = 4, - /obj/item/toy/katana = 2, - /obj/item/weapon/phone = 3 - ) - -//FOR ACTORS GUILD - Containers -/obj/machinery/vending/containers - name = "container dispenser" - desc = "A container that dispenses containers." - icon_state = "robotics" - vend_id = "baygay" - products = list( - /obj/structure/closet/crate/freezer = 2, - /obj/structure/closet = 3, - /obj/structure/closet/crate = 3 - ) - - //RECURSION /obj/machinery/vending/vendors name = "Omni-Vendor" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e6bfd0b2bc6..a282e3c0a0f 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -226,13 +226,6 @@ item_state = "headset" ks2type = /obj/item/device/encryptionkey/heads/hos -/obj/item/device/radio/headset/entertainment - name = "actor's radio headset" - desc = "specially made to make you sound less cheesy." - icon_state = "com_headset" - item_state = "headset" - ks2type = /obj/item/device/encryptionkey/entertainment - /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.set_machine(src)