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

Merge branch 'master' into w_class

Browse Source 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
This commit is contained in:
Mervill
2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 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
+2 -2
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
@@ -24,7 +24,7 @@
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
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
+1 -1
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
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
+2 -2
View File
@@ -1,11 +1,11 @@
/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
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
+2 -2
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
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
+1 -1
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
code/modules/events/wizard/shuffle.dm
+4 -4
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
@@ -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