Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get rid of monkey game mode tails #888

Merged
merged 1 commit into from
Jul 6, 2017
Merged

Get rid of monkey game mode tails #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/__defines/gamemode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#define MODE_CHANGELING "changeling"
#define MODE_CULTIST "cultist"
#define MODE_HIGHLANDER "highlander"
#define MODE_MONKEY "monkey"
#define MODE_RENEGADE "renegade"
#define MODE_REVOLUTIONARY "revolutionary"
#define MODE_LOYALIST "loyalist"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/electropack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
//..()
if(usr.stat || usr.restrained())
return
if(((istype(usr, /mob/living/carbon/human) && ((!( ticker ) || (ticker && ticker.mode != "monkey")) && usr.contents.Find(src))) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf)))))
if(usr.contents.Find(master) || (isturf(loc) && in_range(src, usr)))
usr.set_machine(src)
if(href_list["freq"])
var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
Expand Down
17 changes: 6 additions & 11 deletions code/game/objects/items/devices/scanners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ REAGENT SCANNER
var/mode = 1;


/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/user)
if ((CLUMSY in user.mutations) && prob(50))
user << text("<span class='warning'>You try to analyze the floor's vitals!</span>")
for(var/mob/O in viewers(M, null))
Expand All @@ -36,8 +36,7 @@ REAGENT SCANNER
user.show_message("<span class='notice'>Key: Suffocation/Toxin/Burns/Brute</span>", 1)
user.show_message("<span class='notice'>Body Temperature: ???</span>", 1)
return
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
if(!user.IsAdvancedToolUser())
return
flick("health2", src)
user.visible_message("<span class='notice'>[user] has analyzed [M]'s vitals.</span>","<span class='notice'>You have analyzed [M]'s vitals.</span>")
Expand Down Expand Up @@ -208,11 +207,9 @@ REAGENT SCANNER
return atmosanalyzer_scan(src, air, user)

/obj/item/device/analyzer/attack_self(mob/user as mob)

if (user.stat)
if(user.stat)
return
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
if(!user.IsAdvancedToolUser())
return

analyze_gases(src, user)
Expand Down Expand Up @@ -251,8 +248,7 @@ REAGENT SCANNER
/obj/item/device/mass_spectrometer/attack_self(mob/user as mob)
if (user.stat)
return
if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
if (!user.IsAdvancedToolUser())
return
if(reagents.total_volume)
var/list/blood_traces = list()
Expand Down Expand Up @@ -302,8 +298,7 @@ REAGENT SCANNER
return
if (user.stat)
return
if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
if (!user.IsAdvancedToolUser())
return
if(!istype(O))
return
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/items/weapons/weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
user << "<span class='danger'>You've been silenced!</span>"
return

if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "<span class='danger'>You don't have the dexterity to do this!</span>"
if(!user.IsAdvancedToolUser())
return

if ((CLUMSY in user.mutations) && prob(50))
Expand Down
5 changes: 2 additions & 3 deletions code/modules/mining/mine_turfs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@
new /obj/effect/mineral(src, mineral)

//Not even going to touch this pile of spaghetti
/turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob)
/turf/simulated/mineral/attackby(obj/item/weapon/W, mob/living/user)

if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
usr << "\red You don't have the dexterity to do this!"
if (!user.IsAdvancedToolUser())
return

if (istype(W, /obj/item/device/core_sampler))
Expand Down
10 changes: 4 additions & 6 deletions code/modules/power/turbine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,12 @@
..()
if(stat & BROKEN)
return
if (usr.stat || usr.restrained() )
if(usr.stat || usr.restrained() )
return
if(!usr.IsAdvancedToolUser())
return
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
if(!istype(usr, /mob/living/silicon/ai))
usr << "\red You don't have the dexterity to do this!"
return

if (( usr.machine==src && ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
if(get_dist(src, usr) <= 1 || isAI(usr))


if( href_list["close"] )
Expand Down