cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize CLUMSY

Browse Source 
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:49:22 -05:00
committed by ZomgPonies
parent 22a2df1115
commit d49e6d3bf4
34 changed files with 370 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/changeling.dm
+1 -1
View File
@@ -125,7 +125,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
if (changeling.current.mind)
if (changeling.current.mind.assigned_role == "Clown")
changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself."
changeling.current.mutations.Remove(CLUMSY)
changeling.current.mutations.Remove(M_CLUMSY)
var/obj_count = 1
for(var/datum/objective/objective in changeling.objectives)
code/game/gamemodes/cult/cult.dm
+1 -1
View File
@@ -131,7 +131,7 @@
if (mob.mind)
if (mob.mind.assigned_role == "Clown")
mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
mob.mutations.Remove(CLUMSY)
mob.mutations.Remove(M_CLUMSY)
var/obj/item/weapon/paper/talisman/supply/T = new(mob)
code/game/gamemodes/revolution/revolution.dm
+1 -1
View File
@@ -134,7 +134,7 @@
if (mob.mind)
if (mob.mind.assigned_role == "Clown")
mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
mob.mutations.Remove(CLUMSY)
mob.mutations.Remove(M_CLUMSY)
var/obj/item/device/flash/T = new(mob)
code/game/gamemodes/traitor/traitor.dm
+1 -1
View File
@@ -248,7 +248,7 @@
if (traitor_mob.mind)
if (traitor_mob.mind.assigned_role == "Clown")
traitor_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
traitor_mob.mutations.Remove(CLUMSY)
traitor_mob.mutations.Remove(M_CLUMSY)
// find a radio! toolbox(es), backpack, belt, headset
var/loc = ""
code/game/gamemodes/vampire/vampire.dm
+1 -1
View File
@@ -192,7 +192,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
if (vampire.current.mind)
if (vampire.current.mind.assigned_role == "Clown")
vampire.current << "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself."
vampire.current.mutations.Remove(CLUMSY)
vampire.current.mutations.Remove(M_CLUMSY)
var/obj_count = 1
for(var/datum/objective/objective in vampire.objectives)