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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/wizard/aid.dm
+2 -2
View File
@@ -17,7 +17,7 @@
S.clothes_req = 0
spell_improved = 1
if(spell_improved)
L << "<span class='notice'>You suddenly feel like you never needed those garish robes in the first place...</span>"
to_chat(L, "<span class='notice'>You suddenly feel like you never needed those garish robes in the first place...</span>")
//--//
@@ -53,4 +53,4 @@
if(5)
S.name = "Ludicrous [S.name]"
L << "<span class='notice'>You suddenly feel more competent with your casting!</span>"
to_chat(L, "<span class='notice'>You suddenly feel more competent with your casting!</span>")
code/modules/events/wizard/departmentrevolt.dm
+2 -2
View File
@@ -44,8 +44,8 @@
citizens += H
ticker.mode.traitors += M
M.special_role = "separatist"
H.attack_log += "\[[time_stamp()]\] <font color='red'>Was made into a separatist, long live [nation]!</font>"
H << "<B>You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!</B>"
H.log_message("<font color='red'>Was made into a separatist, long live [nation]!</font>", INDIVIDUAL_ATTACK_LOG)
to_chat(H, "<B>You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!</B>")
if(citizens.len)
var/message
for(var/job in jobs_to_revolt)
code/modules/events/wizard/fakeexplosion.dm
+1 -1
View File
@@ -8,4 +8,4 @@
/datum/round_event/wizard/fake_explosion/start()
for(var/mob/M in player_list)
M << 'sound/machines/Alarm.ogg'
addtimer(CALLBACK(ticker, /datum/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
addtimer(CALLBACK(ticker, /datum/controller/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
code/modules/events/wizard/ghost.dm
+4 -5
View File
@@ -2,13 +2,12 @@
name = "G-G-G-Ghosts!"
weight = 3
typepath = /datum/round_event/wizard/ghost
max_occurrences = 5
max_occurrences = 1
earliest_start = 0
/datum/round_event/wizard/ghost/start()
for(var/mob/dead/observer/G in player_list)
G.invisibility = 0
G << "You suddenly feel extremely obvious..."
var/msg = "<span class='warning'>You suddenly feel extremely obvious...</span>"
set_observer_default_invisibility(0, msg)
//--//
@@ -24,4 +23,4 @@
for(var/mob/dead/observer/G in player_list)
G.verbs += /mob/dead/observer/verb/boo
G.verbs += /mob/dead/observer/verb/possess
G << "You suddenly feel a welling of new spooky powers..."
to_chat(G, "You suddenly feel a welling of new spooky powers...")
code/modules/events/wizard/greentext.dm
+8 -8
View File
@@ -16,7 +16,7 @@
var/mob/living/carbon/human/H = pick(holder_canadates)
new /obj/item/weapon/greentext(H.loc)
H << "<font color='green'>The mythical greentext appear at your feet! Pick it up if you dare...</font>"
to_chat(H, "<font color='green'>The mythical greentext appear at your feet! Pick it up if you dare...</font>")
/obj/item/weapon/greentext
@@ -36,9 +36,9 @@
poi_list |= src
/obj/item/weapon/greentext/equipped(mob/living/user as mob)
user << "<font color='green'>So long as you leave this place with greentext in hand you know will be happy...</font>"
to_chat(user, "<font color='green'>So long as you leave this place with greentext in hand you know will be happy...</font>")
if(user.mind && user.mind.objectives.len > 0)
user << "<span class='warning'>... so long as you still perform your other objectives that is!</span>"
to_chat(user, "<span class='warning'>... so long as you still perform your other objectives that is!</span>")
new_holder = user
if(!last_holder)
last_holder = user
@@ -50,7 +50,7 @@
/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>"
to_chat(user, "<span class='warning'>A sudden wave of failure washes over you...</span>")
user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
last_holder = null
new_holder = null
@@ -59,7 +59,7 @@
/obj/item/weapon/greentext/process()
if(new_holder && new_holder.z == ZLEVEL_CENTCOM)//you're winner!
new_holder << "<font color='green'>At last it feels like victory is assured!</font>"
to_chat(new_holder, "<font color='green'>At last it feels like victory is assured!</font>")
if(!(new_holder in ticker.mode.traitors))
ticker.mode.traitors += new_holder.mind
new_holder.mind.special_role = "winner"
@@ -67,13 +67,13 @@
O.completed = 1 //YES!
O.owner = new_holder.mind
new_holder.mind.objectives += O
new_holder.attack_log += "\[[time_stamp()]\] <font color='green'>Won with greentext!!!</font>"
new_holder.log_message("<font color='green'>Won with greentext!!!</font>", INDIVIDUAL_ATTACK_LOG)
color_altered_mobs -= new_holder
resistance_flags |= 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>"
to_chat(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 = new_holder //long live the king
@@ -92,7 +92,7 @@
message += "...</span>"
// can't skip the mob check as it also does the decolouring
if(!quiet)
M << message
to_chat(M, message)
/obj/item/weapon/greentext/quiet
quiet = TRUE
code/modules/events/wizard/imposter.dm
+2 -2
View File
@@ -53,6 +53,6 @@
I.mind.objectives += protect_objective
ticker.mode.update_wiz_icons_added(I.mind)
I.attack_log += "\[[time_stamp()]\] <font color='red'>Is an imposter!</font>"
I << "<B>You are an imposter! Trick and confuse the crew to misdirect malice from your handsome original!</B>"
I.log_message("<font color='red'>Is an imposter!</font>", INDIVIDUAL_ATTACK_LOG)
to_chat(I, "<B>You are an imposter! Trick and confuse the crew to misdirect malice from your handsome original!</B>")
I << sound('sound/effects/magic.ogg')
code/modules/events/wizard/invincible.dm
+1 -1
View File
@@ -9,4 +9,4 @@
for(var/mob/living/carbon/human/H in living_mob_list)
H.reagents.add_reagent("adminordrazine", 40) //100 ticks of absolute invinciblity (barring gibs)
H << "<span class='notice'>You feel invincible, nothing can hurt you!</span>"
to_chat(H, "<span class='notice'>You feel invincible, nothing can hurt you!</span>")
code/modules/events/wizard/magicarp.dm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage)
/mob/living/simple_animal/hostile/carp/ranged/New()
/mob/living/simple_animal/hostile/carp/ranged/Initialize()
projectiletype = pick(allowed_projectile_types)
..()
code/modules/events/wizard/race.dm
+1 -1
View File
@@ -24,6 +24,6 @@
H.set_species(new_species)
H.real_name = new_species.random_name(H.gender,1)
H.dna.unique_enzymes = H.dna.generate_unique_enzymes()
H << "<span class='notice'>You feel somehow... different?</span>"
to_chat(H, "<span class='notice'>You feel somehow... different?</span>")
if(!all_the_same)
new_species = pick(all_species)
code/modules/events/wizard/rpgloot.dm
+2 -2
View File
@@ -48,7 +48,7 @@
return
var/quality = target.force - initial(target.force)
if(quality > 9 && prob((quality - 9)*10))
user << "<span class='danger'>[target] catches fire!</span>"
to_chat(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
@@ -59,5 +59,5 @@
target.throwforce += 1
for(var/value in target.armor)
target.armor[value] += 1
user << "<span class='notice'>[target] glows blue and seems vaguely \"better\"!</span>"
to_chat(user, "<span class='notice'>[target] glows blue and seems vaguely \"better\"!</span>")
qdel(src)