shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/wizard/aid.dm
+2 -2
View File
@@ -3,7 +3,7 @@
/datum/round_event_control/wizard/robelesscasting //EI NUDTH!
name = "Robeless Casting"
weight = 2
typepath = /datum/round_event/wizard/robelesscasting
typepath = /datum/round_event/wizard/robelesscasting/
max_occurrences = 1
earliest_start = 0
@@ -24,7 +24,7 @@
/datum/round_event_control/wizard/improvedcasting //blink x5 disintergrate x5 here I come!
name = "Improved Casting"
weight = 3
typepath = /datum/round_event/wizard/improvedcasting
typepath = /datum/round_event/wizard/improvedcasting/
max_occurrences = 4 //because that'd be max level spells
earliest_start = 0
code/modules/events/wizard/blobies.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/blobies //avast!
name = "Zombie Outbreak"
weight = 3
typepath = /datum/round_event/wizard/blobies
typepath = /datum/round_event/wizard/blobies/
max_occurrences = 3
earliest_start = 12000 // 20 minutes (gotta get some bodies made!)
code/modules/events/wizard/curseditems.dm
+7 -7
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/cursed_items //fashion disasters
name = "Cursed Items"
weight = 3
typepath = /datum/round_event/wizard/cursed_items
typepath = /datum/round_event/wizard/cursed_items/
max_occurrences = 3
earliest_start = 0
@@ -11,7 +11,7 @@
/datum/round_event/wizard/cursed_items/start()
var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "catgirls2015")
var/list/wearslots = list(slot_wear_suit, slot_shoes, slot_head, slot_wear_mask, slot_gloves, slot_ears)
var/list/wearslots = list(slot_wear_suit, slot_shoes, slot_head, slot_wear_mask, slot_r_hand, slot_gloves, slot_ears)
var/list/loadout = list()
var/ruins_spaceworthiness
var/ruins_wizard_loadout
@@ -19,12 +19,12 @@
switch(item_set)
if("wizardmimic")
loadout = list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal/magic, /obj/item/clothing/head/wizard)
loadout = list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard)
ruins_spaceworthiness = 1
if("swords")
loadout[5] = /obj/item/weapon/katana/cursed
if("bigfatdoobie")
loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy
loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy/
ruins_spaceworthiness = 1
if("boxing")
loadout[4] = /obj/item/clothing/mask/luchador
@@ -38,14 +38,14 @@
ruins_wizard_loadout = 1
for(var/mob/living/carbon/human/H in living_mob_list)
if(ruins_spaceworthiness && (H.z != 1 || isspaceturf(H.loc) || isplasmaman(H)))
if(ruins_spaceworthiness && (H.z != 1 || istype(H.loc, /turf/open/space)))
continue //#savetheminers
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.gloves, H.ears) //add new slots as needed to back
for(var/i in 1 to loadout.len)
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
for(var/i = 1, i <= loadout.len, i++)
if(loadout[i])
var/obj/item/J = loadout[i]
var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
code/modules/events/wizard/departmentrevolt.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/deprevolt //stationwide!
name = "Departmental Uprising"
weight = 0 //An order that requires order in a round of chaos was maybe not the best idea. Requiescat in pace departmental uprising August 2014 - March 2015
typepath = /datum/round_event/wizard/deprevolt
typepath = /datum/round_event/wizard/deprevolt/
max_occurrences = 1
earliest_start = 0
code/modules/events/wizard/fakeexplosion.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/fake_explosion //Oh no the station is gone!
name = "Fake Nuclear Explosion"
weight = 0 //Badmin exclusive now because once it's expected its not funny
typepath = /datum/round_event/wizard/fake_explosion
typepath = /datum/round_event/wizard/fake_explosion/
max_occurrences = 1
earliest_start = 0
code/modules/events/wizard/ghost.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/ghost //The spook is real
name = "G-G-G-Ghosts!"
weight = 3
typepath = /datum/round_event/wizard/ghost
typepath = /datum/round_event/wizard/ghost/
max_occurrences = 5
earliest_start = 0
code/modules/events/wizard/greentext.dm
+9 -10
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/greentext //Gotta have it!
name = "Greentext"
weight = 4
typepath = /datum/round_event/wizard/greentext
typepath = /datum/round_event/wizard/greentext/
max_occurrences = 1
earliest_start = 0
@@ -22,13 +22,13 @@
/obj/item/weapon/greentext
name = "greentext"
desc = "No one knows what this massive tome does, but it feels <i><font color='green'>desirable</font></i> all the same..."
w_class = WEIGHT_CLASS_BULKY
w_class = 4
icon = 'icons/obj/wizard.dmi'
icon_state = "greentext"
var/mob/living/last_holder
var/mob/living/new_holder
var/list/color_altered_mobs = list()
resistance_flags = FIRE_PROOF | ACID_PROOF
burn_state = FIRE_PROOF
var/quiet = FALSE
/obj/item/weapon/greentext/New()
@@ -44,14 +44,14 @@
last_holder = user
if(!(user in color_altered_mobs))
color_altered_mobs += user
user.add_atom_colour("#00FF00", ADMIN_COLOUR_PRIORITY)
user.color = "#00FF00"
START_PROCESSING(SSobj, src)
..()
/obj/item/weapon/greentext/dropped(mob/living/user as mob)
if(user in color_altered_mobs)
user << "<span class='warning'>A sudden wave of failure washes over you...</span>"
user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
user.color = "#FF0000" //ya blew it
last_holder = null
new_holder = null
STOP_PROCESSING(SSobj, src)
@@ -69,16 +69,16 @@
new_holder.mind.objectives += O
new_holder.attack_log += "\[[time_stamp()]\] <font color='green'>Won with greentext!!!</font>"
color_altered_mobs -= new_holder
resistance_flags |= ON_FIRE
burn_state = ON_FIRE
qdel(src)
if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped
last_holder << "<span class='warning'>A sudden wave of failure washes over you...</span>"
last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
last_holder.color = "#FF0000"
last_holder = new_holder //long live the king
/obj/item/weapon/greentext/Destroy(force)
if(!(resistance_flags & ON_FIRE) && !force)
if((burn_state != ON_FIRE) && (!force))
return QDEL_HINT_LETMELIVE
. = ..()
@@ -87,8 +87,7 @@
var/message = "<span class='warning'>A dark temptation has passed from this world"
if(M in color_altered_mobs)
message += " and you're finally able to forgive yourself"
if(M.color == "#FF0000" || M.color == "#00FF00")
M.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
M.color = initial(M.color)
message += "...</span>"
// can't skip the mob check as it also does the decolouring
if(!quiet)
code/modules/events/wizard/imposter.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/imposter //Mirror Mania
name = "Imposter Wizard"
weight = 1
typepath = /datum/round_event/wizard/imposter
typepath = /datum/round_event/wizard/imposter/
max_occurrences = 1
earliest_start = 0
code/modules/events/wizard/invincible.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/invincible //Boolet Proof
name = "Invincibility"
weight = 3
typepath = /datum/round_event/wizard/invincible
typepath = /datum/round_event/wizard/invincible/
max_occurrences = 5
earliest_start = 0
code/modules/events/wizard/lava.dm
+3 -3
View File
@@ -1,15 +1,15 @@
/datum/round_event_control/wizard/lava //THE LEGEND NEVER DIES
name = "The Floor Is LAVA!"
weight = 2
typepath = /datum/round_event/wizard/lava
typepath = /datum/round_event/wizard/lava/
max_occurrences = 3
earliest_start = 0
/datum/round_event/wizard/lava
/datum/round_event/wizard/lava/
endWhen = 0
var/started = FALSE
/datum/round_event/wizard/lava/start()
if(!started)
started = TRUE
SSweather.run_weather("the floor is lava")
SSweather.run_weather("the floor is lava")
code/modules/events/wizard/magicarp.dm
+2 -2
View File
@@ -1,11 +1,11 @@
/datum/round_event_control/wizard/magicarp //these fish is loaded
name = "Magicarp"
weight = 1
typepath = /datum/round_event/wizard/magicarp
typepath = /datum/round_event/wizard/magicarp/
max_occurrences = 1
earliest_start = 0
/datum/round_event/wizard/magicarp
/datum/round_event/wizard/magicarp/
announceWhen = 3
startWhen = 50
code/modules/events/wizard/petsplosion.dm
+3 -3
View File
@@ -1,11 +1,11 @@
/datum/round_event_control/wizard/petsplosion //the horror
name = "Petsplosion"
weight = 2
typepath = /datum/round_event/wizard/petsplosion
typepath = /datum/round_event/wizard/petsplosion/
max_occurrences = 1 //Exponential growth is nothing to sneeze at!
earliest_start = 0
/datum/round_event/wizard/petsplosion
/datum/round_event/wizard/petsplosion/
endWhen = 61 //1 minute (+1 tick for endWhen not to interfere with tick)
var/countdown = 0
@@ -13,5 +13,5 @@
if(activeFor >= 30 * countdown) // 0 seconds : 2 animals | 30 seconds : 4 animals | 1 minute : 8 animals
countdown += 1
for(var/mob/living/simple_animal/F in living_mob_list) //If you cull the heard before the next replication, things will be easier for you
if(!ishostile(F))
if(!istype(F, /mob/living/simple_animal/hostile))
new F.type(F.loc)
code/modules/events/wizard/race.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/race //Lizard Wizard? Lizard Wizard.
name = "Race Swap"
weight = 2
typepath = /datum/round_event/wizard/race
typepath = /datum/round_event/wizard/race/
max_occurrences = 5
earliest_start = 0
code/modules/events/wizard/rpgloot.dm
+5 -6
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/rpgloot //its time to minmax your shit
name = "RPG Loot"
weight = 3
typepath = /datum/round_event/wizard/rpgloot
typepath = /datum/round_event/wizard/rpgloot/
max_occurrences = 1
earliest_start = 0
@@ -30,7 +30,7 @@
if(istype(I,/obj/item/weapon/storage))
var/obj/item/weapon/storage/S = I
if(prob(upgrade_scroll_chance) && S.contents.len < S.storage_slots && !S.invisibility)
if(prob(upgrade_scroll_chance) && S.contents.len < S.storage_slots)
var/obj/item/upgradescroll/scroll = new
S.handle_item_insertion(scroll,1)
upgrade_scroll_chance = max(0,upgrade_scroll_chance-100)
@@ -41,7 +41,7 @@
desc = "Somehow, this piece of paper can be applied to items to make them \"better\". Apparently there's a risk of losing the item if it's already \"too good\". <i>This all feels so arbitrary...</i>"
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
w_class = WEIGHT_CLASS_TINY
w_class = 1
/obj/item/upgradescroll/afterattack(obj/item/target, mob/user , proximity)
if(!proximity || !istype(target))
@@ -49,9 +49,8 @@
var/quality = target.force - initial(target.force)
if(quality > 9 && prob((quality - 9)*10))
user << "<span class='danger'>[target] catches fire!</span>"
if(target.resistance_flags & (LAVA_PROOF|FIRE_PROOF))
target.resistance_flags &= ~(LAVA_PROOF|FIRE_PROOF)
target.resistance_flags |= FLAMMABLE
if(target.burn_state == -1)
target.burn_state = 0
target.fire_act()
qdel(src)
return
code/modules/events/wizard/shuffle.dm
+5 -5
View File
@@ -4,7 +4,7 @@
/datum/round_event_control/wizard/shuffleloc //Somewhere an AI is crying
name = "Change Places!"
weight = 2
typepath = /datum/round_event/wizard/shuffleloc
typepath = /datum/round_event/wizard/shuffleloc/
max_occurrences = 5
earliest_start = 0
@@ -40,7 +40,7 @@
/datum/round_event_control/wizard/shufflenames //Face/off joke
name = "Change Faces!"
weight = 4
typepath = /datum/round_event/wizard/shufflenames
typepath = /datum/round_event/wizard/shufflenames/
max_occurrences = 5
earliest_start = 0
@@ -74,7 +74,7 @@
/datum/round_event_control/wizard/shuffleminds //Basically Mass Ranged Mindswap
name = "Change Minds!"
weight = 1
typepath = /datum/round_event/wizard/shuffleminds
typepath = /datum/round_event/wizard/shuffleminds/
max_occurrences = 3
earliest_start = 0
@@ -82,7 +82,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) || (H.mind in ticker.mode.apprentices))
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
@@ -91,7 +91,7 @@
shuffle(mobs)
var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer
var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer/
while(mobs.len > 1)
var/mob/living/carbon/human/H = pick(mobs)
mobs -= H
code/modules/events/wizard/summons.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/wizard/summonguns //The Classic
name = "Summon Guns"
weight = 1
typepath = /datum/round_event/wizard/summonguns
typepath = /datum/round_event/wizard/summonguns/
max_occurrences = 1
earliest_start = 0
@@ -16,7 +16,7 @@
/datum/round_event_control/wizard/summonmagic //The Somewhat Less Classic
name = "Summon Magic"
weight = 1
typepath = /datum/round_event/wizard/summonmagic
typepath = /datum/round_event/wizard/summonmagic/
max_occurrences = 1
earliest_start = 0