From 238451dbc9925f9f051e105bade30d608538bc27 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Sun, 6 Apr 2014 12:05:41 -0700 Subject: [PATCH 1/2] die monkey emergency DIE --- code/game/machinery/bots/ed209bot.dm | 4 - code/game/machinery/igniter.dm | 4 +- code/game/machinery/machinery.dm | 4 +- code/game/objects/items/stacks/medical.dm | 2 +- .../mob/living/carbon/monkey/monkey.dm | 5 +- code/modules/paperwork/photography.dm | 2 +- code/modules/power/apc.dm | 10 +- code/unused/gamemodes/monkey.dm | 131 ------------------ 8 files changed, 11 insertions(+), 151 deletions(-) delete mode 100644 code/unused/gamemodes/monkey.dm diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 8de8e20fb5..0b9ee0f674 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -231,8 +231,6 @@ Auto Patrol: []"}, continue if (istype(C, /mob/living/carbon/human)) threatlevel = src.assess_perp(C) - else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey")) - threatlevel = 4 //src.speak(C.real_name + text(": threat: []", threatlevel)) if (threatlevel < 4 ) continue @@ -637,8 +635,6 @@ Auto Patrol: []"}, if (istype(C, /mob/living/carbon/human)) src.threatlevel = src.assess_perp(C) - else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey")) - src.threatlevel = 4 if (!src.threatlevel) continue diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 817a3603e8..774d2c265a 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -14,9 +14,7 @@ return src.attack_hand(user) /obj/machinery/igniter/attack_paw(mob/user as mob) - if ((ticker && ticker.mode.name == "monkey")) - return src.attack_hand(user) - return + src.attack_hand(user) /obj/machinery/igniter/attack_hand(mob/user as mob) if(..()) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 99308ddab4..0b16a5aee2 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -174,7 +174,7 @@ Class Procs: return 1 if ( ! (istype(usr, /mob/living/carbon/human) || \ istype(usr, /mob/living/silicon) || \ - istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) + istype(usr, /mob/living/carbon/monkey)) ) usr << "\red You don't have the dexterity to do this!" return 1 @@ -216,7 +216,7 @@ Class Procs: return 1 if ( ! (istype(usr, /mob/living/carbon/human) || \ istype(usr, /mob/living/silicon) || \ - istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) + istype(usr, /mob/living/carbon/monkey)) ) usr << "\red You don't have the dexterity to do this!" return 1 /* diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 868e2d4b8d..c53bd3f99b 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -17,7 +17,7 @@ if ( ! (istype(user, /mob/living/carbon/human) || \ istype(user, /mob/living/silicon) || \ - istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) + istype(user, /mob/living/carbon/monkey)) ) user << "\red You don't have the dexterity to do this!" return 1 diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 92edb9aacd..b42f51c9ec 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -513,7 +513,4 @@ /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools - if(!ticker) return 0 - if(!ticker.mode.name == "monkey") return 0 - return 1 - + return 0 diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index a76b8de25d..fc71edff2a 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -84,7 +84,7 @@ /obj/item/weapon/storage/photo_album/MouseDrop(obj/over_object as obj) - if((istype(usr, /mob/living/carbon/human) || (ticker && ticker.mode.name == "monkey"))) + if((istype(usr, /mob/living/carbon/human))) var/mob/M = usr if(!( istype(over_object, /obj/screen) )) return ..() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a68c385e35..8959bd1734 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -144,7 +144,7 @@ init() else area = src.loc.loc:master - area.apc |= src + area.apc |= src opened = 1 operating = 0 name = "[area.name] APC" @@ -171,7 +171,7 @@ cell.charge = start_charge * cell.maxcharge / 100.0 // (convert percentage to actual value) var/area/A = src.loc.loc - + //if area isn't specified use current if(isarea(A) && src.areastring == null) @@ -913,7 +913,7 @@ return 0 if ( ! (istype(user, /mob/living/carbon/human) || \ istype(user, /mob/living/silicon) || \ - istype(user, /mob/living/carbon/monkey) /*&& ticker && ticker.mode.name == "monkey"*/) ) + istype(user, /mob/living/carbon/monkey)) ) user << "\red You don't have the dexterity to use this [src]!" nanomanager.close_user_uis(user, src) @@ -1241,7 +1241,7 @@ autoflag = 3 area.poweralert(1, src) if(cell.charge >= 4000) - area.poweralert(1, src) + area.poweralert(1, src) else if(cell.charge < 1250 && cell.charge > 750 && longtermpower < 0) // <30%, turn off equipment if(autoflag != 2) equipment = autoset(equipment, 2) @@ -1307,7 +1307,7 @@ environ = autoset(environ, 0) area.poweralert(0, src) autoflag = 0 - + // update icon & area power if anything changed diff --git a/code/unused/gamemodes/monkey.dm b/code/unused/gamemodes/monkey.dm deleted file mode 100644 index 04b0689f6a..0000000000 --- a/code/unused/gamemodes/monkey.dm +++ /dev/null @@ -1,131 +0,0 @@ -#define MONKEY_MODE_RUNNING 0 -#define MONKEY_MODE_NO_RABID_LEFT 1 -#define MONKEY_MODE_SHUTTLE_CAPTURED 2 -#define MONKEY_MODE_SHUTTLE_WITH_HUMANS 3 - -#define MONKEY_MODE_MONKEYS 4 - -/datum/game_mode/monkey - name = "monkey" - config_tag = "monkey" - var/state = MONKEY_MODE_RUNNING - var/list/datum/mind/initial_monkeys = new - -/datum/game_mode/monkey/announce() - world << "The current game mode is - Monkey!" - world << "Some of your crew members have been infected by a mutageous virus!" - world << "Escape on the shuttle but the humans have precedence!" - -/datum/game_mode/monkey/can_start() - if (num_players()<2) - return 0 - for(var/mob/new_player/P in player_list) - if(P.client && P.ready && !jobban_isbanned(P, "Syndicate")) - return 1 - return 0 - -/datum/game_mode/monkey/pre_setup() - var/list/possible_monkeys = get_players_for_role(BE_MONKEY) - - // stop setup if no possible monkeys - if(!possible_monkeys.len) - return 0 - - var/num_monkeys = MONKEY_MODE_MONKEYS - var/num_players = num_players() - - if (num_players<=num_monkeys) - num_monkeys = round(num_players/2) - - for(var/j = 1 to num_monkeys) - if (!possible_monkeys.len) - break - var/datum/mind/monkey = pick(possible_monkeys) - possible_monkeys-=monkey - initial_monkeys += monkey - monkey.special_role = "monkey" - - if(!initial_monkeys.len) - return 0 - return 1 - -/datum/game_mode/monkey/post_setup() - spawn (50) - for (var/datum/mind/monkey in initial_monkeys) - var/mob/living/carbon/human/H = monkey.current - var/mob/living/carbon/monkey/new_monkey = H.monkeyize() - new_monkey << "Your goal is to capture the entire human civilization and your first target is Centcom. Hijack the shuttle without humans aboard!" - - for (var/mob/living/carbon/monkey/rabid_monkey in mob_list) - if (!(rabid_monkey.mind in initial_monkeys) && (!isturf(rabid_monkey.loc) || rabid_monkey.z!=1)) - continue - rabid_monkey.contract_disease(new /datum/disease/jungle_fever,1,0) - del(initial_monkeys) - ..() - -/datum/game_mode/monkey/proc/is_important_monkey(var/mob/living/carbon/monkey/M as mob) - var/turf/T = get_turf(M) - var/area/A = get_area(M) - if(M.stat!=2) - - for(var/datum/disease/D in M.viruses) - if(istype(D, /datum/disease/jungle_fever) && ( T.z==1 || is_type_in_list(A, centcom_areas))) - return 1 - - -/datum/game_mode/monkey/check_win() - if (state==MONKEY_MODE_SHUTTLE_CAPTURED || state==MONKEY_MODE_SHUTTLE_WITH_HUMANS) - return - var/infected_count = 0 - for (var/mob/living/carbon/monkey/rabid_monkey in mob_list) - if (is_important_monkey(rabid_monkey)) - infected_count++ - if (infected_count==0) - state = MONKEY_MODE_NO_RABID_LEFT - -/datum/game_mode/monkey/check_finished() - return (emergency_shuttle.location==2) || (state>0) - -/datum/game_mode/monkey/declare_completion() - var/monkeywin = 0 - if (state != MONKEY_MODE_NO_RABID_LEFT) - for(var/mob/living/carbon/monkey/monkey_player in mob_list) - if (is_important_monkey(monkey_player)) - var/area/A = get_area(monkey_player) - if ( is_type_in_list(A, centcom_areas)) - monkeywin = 1 - break - - if(monkeywin) - for(var/mob/living/carbon/human/human_player in mob_list) - if (human_player.stat != 2) - var/area/A = get_area(human_player) - if (istype(A, /area/shuttle/escape/centcom)) - monkeywin = 0 - break - - if (monkeywin) - feedback_set_details("round_end_result","win - monkey win") - world << "The monkeys have won! Humanity is doomed!" - for (var/mob/living/carbon/human/player in player_list) - spawn(rand(0,150)) - player.monkeyize() - sleep(200) - else - feedback_set_details("round_end_result","loss - crew win") - world << "The Research Staff has stopped the monkey invasion!" - ..() - return 1 - - -/datum/game_mode/proc/auto_declare_completion_monkey() - for(var/mob/living/carbon/monkey/monkey_player in mob_list) - for(var/datum/disease/D in monkey_player.viruses) - if (istype(D, /datum/disease/jungle_fever) && monkey_player.ckey) - world << "[monkey_player.ckey] was played infested [monkey_player]. [monkey_player.stat == 2 ? "(DEAD)" : ""]" - return 1 - -#undef MONKEY_MODE_RUNNING -#undef MONKEY_MODE_NO_RABID_LEFT -#undef MONKEY_MODE_SHUTTLE_CAPTURED -#undef MONKEY_MODE_SHUTTLE_WITH_HUMANS From 7b1f8a9994ee2d86da2fcf1a611c06a857ca91ea Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Wed, 9 Apr 2014 14:07:16 -0700 Subject: [PATCH 2/2] changes attack hand to return --- code/game/machinery/igniter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 774d2c265a..7f108d8d86 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -14,7 +14,7 @@ return src.attack_hand(user) /obj/machinery/igniter/attack_paw(mob/user as mob) - src.attack_hand(user) + return /obj/machinery/igniter/attack_hand(mob/user as mob) if(..()) @@ -154,4 +154,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return