This commit is contained in:
FalseIncarnate
2016-12-21 17:36:10 -05:00
parent 1913969578
commit 48cf5148f0
3 changed files with 14 additions and 33 deletions
+1 -8
View File
@@ -17,17 +17,10 @@ var/global/datum/controller/process/mob_hunt/mob_hunt_server
start_delay = 20
mob_hunt_server = src
/datum/controller/process/mob_hunt/Destroy()
for(var/datum/data/pda/app/mob_hunter_game/client in connected_clients)
client.disconnect("Server Destruction")
if(mob_hunt_server && mob_hunt_server == src)
mob_hunt_server = null
return ..()
/datum/controller/process/mob_hunt/doWork()
if(reset_cooldown) //if reset_cooldown is set (we are on cooldown, duh), reduce the remaining cooldown every cycle
reset_cooldown--
if(server_status == 0)
if(!server_status)
return
client_mob_update()
if(normal_spawns.len < max_normal_spawns)
+1 -1
View File
@@ -61,7 +61,7 @@
if(mob_info.is_trap) //traps work even if you ran into them before, which is why this is before the clients_encountered check
if(client.hacked) //hacked copies of the game (copies capable of setting traps) are protected from traps
return
if(istype(P.loc, /mob/living/carbon))
if(iscarbon(P.loc))
var/mob/living/carbon/C = P.loc
//Strike them down with a lightning bolt to complete the illusion (copied from the surge reagent overdose, probably could make this a general-use proc in the future)
playsound(get_turf(C), 'sound/effects/eleczap.ogg', 75, 1)
+12 -24
View File
@@ -53,8 +53,7 @@
/obj/item/weapon/cartridge/atmos
name = "BreatheDeep Cartridge"
icon_state = "cart-a"
programs = list(
new/datum/data/pda/utility/scanmode/gas)
programs = list(new/datum/data/pda/utility/scanmode/gas)
/obj/item/weapon/cartridge/medical
name = "Med-U Cartridge"
@@ -66,8 +65,7 @@
/obj/item/weapon/cartridge/chemistry
name = "ChemWhiz Cartridge"
icon_state = "cart-chem"
programs = list(
new/datum/data/pda/utility/scanmode/reagent)
programs = list(new/datum/data/pda/utility/scanmode/reagent)
/obj/item/weapon/cartridge/security
name = "R.O.B.U.S.T. Cartridge"
@@ -94,30 +92,25 @@
name = "CustodiPRO Cartridge"
desc = "The ultimate in clean-room design."
icon_state = "cart-j"
programs = list(
new/datum/data/pda/app/janitor)
programs = list(new/datum/data/pda/app/janitor)
/obj/item/weapon/cartridge/lawyer
name = "P.R.O.V.E. Cartridge"
icon_state = "cart-s"
programs = list(
new/datum/data/pda/app/crew_records/security)
programs = list(new/datum/data/pda/app/crew_records/security)
/obj/item/weapon/cartridge/clown
name = "Honkworks 5.0"
icon_state = "cart-clown"
charges = 5
programs = list(
new/datum/data/pda/utility/honk)
messenger_plugins = list(
new/datum/data/pda/messenger_plugin/virus/clown)
programs = list(new/datum/data/pda/utility/honk)
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/clown)
/obj/item/weapon/cartridge/mime
name = "Gestur-O 1000"
icon_state = "cart-mi"
charges = 5
messenger_plugins = list(
new/datum/data/pda/messenger_plugin/virus/mime)
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/mime)
/*
/obj/item/weapon/cartridge/botanist
@@ -129,8 +122,7 @@
/obj/item/weapon/cartridge/signal
name = "generic signaler cartridge"
desc = "A data cartridge with an integrated radio signaler module."
programs = list(
new/datum/data/pda/app/signaller)
programs = list(new/datum/data/pda/app/signaller)
/obj/item/weapon/cartridge/signal/initialize()
radio = new /obj/item/radio/integrated/signal(src)
@@ -162,8 +154,7 @@
/obj/item/weapon/cartridge/head
name = "Easy-Record DELUXE"
icon_state = "cart-h"
programs = list(
new/datum/data/pda/app/status_display)
programs = list(new/datum/data/pda/app/status_display)
/obj/item/weapon/cartridge/hop
name = "HumanResources9001"
@@ -303,10 +294,8 @@
icon_state = "cart"
var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing.
charges = 4
programs = list(
new/datum/data/pda/utility/toggle_door)
messenger_plugins = list(
new/datum/data/pda/messenger_plugin/virus/detonate)
programs = list(new/datum/data/pda/utility/toggle_door)
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate)
/obj/item/weapon/cartridge/syndicate/New()
var/datum/data/pda/utility/toggle_door/D = programs[1]
@@ -317,8 +306,7 @@
name = "Nano-Mob Hunter GO! Cartridge"
desc = "The hit new PDA game that lets you track down and capture your favorite Nano-Mobs living in your world!"
icon_state = "cart-eye"
programs = list(
new/datum/data/pda/app/mob_hunter_game)
programs = list(new/datum/data/pda/app/mob_hunter_game)
var/emagged = 0
/obj/item/weapon/cartridge/mob_hunt_game/attackby(obj/item/O, mob/user, params)