cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up

Browse Source 
Apprentice clean up / bugfixes
This commit is contained in:
Razharas
2015-12-11 22:50:46 +03:00
parent 850f8c6792 6a64864805
commit 7929c027fa
9 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/wizard/curseditems.dm
+1 -1
View File
@@ -37,7 +37,7 @@
for(var/mob/living/carbon/human/H in living_mob_list)
if(ruins_spaceworthiness && (H.z != 1 || istype(H.loc, /turf/space))) continue //#savetheminers
if(ruins_wizard_loadout && H.mind && H.mind in ticker.mode.wizards) continue
if(ruins_wizard_loadout && H.mind && ((H.mind in ticker.mode.wizards) || (H.mind in ticker.mode.apprentices))) continue
if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
H.gender = FEMALE
var/list/slots = list(H.wear_suit, H.shoes, H.head, H.wear_mask, H.r_hand, H.gloves, H.ears) //add new slots as needed to back
code/modules/events/wizard/imposter.dm
+1 -1
View File
@@ -35,7 +35,7 @@
I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null))
I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
ticker.mode.traitors += I.mind
ticker.mode.apprentices += I.mind
I.mind.special_role = "imposter"
var/datum/objective/protect/protect_objective = new /datum/objective/protect
code/modules/events/wizard/rpgloot.dm
+1 -1
View File
@@ -15,7 +15,7 @@
continue
var/quality = rand(-5,5)
if(quality > 0)
I.name = "[pick(prefixespositive)] [I.name] of [pick(suffixes)] plus [quality]"
I.name = "[pick(prefixespositive)] [I.name] of [pick(suffixes)] +[quality]"
else if(quality < 0)
I.name = "[pick(prefixesnegative)] [I.name] of [pick(suffixes)] [quality]"
else
code/modules/events/wizard/shuffle.dm
+1 -1
View File
@@ -77,7 +77,7 @@
var/list/mobs = list()
for(var/mob/living/carbon/human/H in living_mob_list)
if(!H.stat || !H.mind || H.mind in ticker.mode.wizards) continue //the wizard(s) are spared on this one
if(!H.stat || !H.mind || (H.mind in ticker.mode.wizards) || (H.mind in ticker.mode.apprentices)) continue //the wizard(s) are spared on this one
mobs += H
if(!mobs) return