cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Commented out the lagspike wizarditis bit of code (too derpy atm to actually fix it).

Browse Source 
Added suspenders for mime.
Changed the virus crate so that it is a secure crate now.
Added the ability for admins to choose which virus to spread when triggering an outbreak.
Changed the dorf mode secret to be more manly.
Made clown's mask a gas one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@328 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-19 19:36:10 +00:00
parent 063eef7317
commit b7e22cc56b
10 changed files with 53 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/wizarditis.dm
+3 -3
View File
@@ -43,7 +43,7 @@ STI KALY - blind
return
if(prob(2))
affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]."
if(prob(5))
/* if(prob(5))
var/list/theareas = new/list()
for(var/area/AR in world)
@@ -73,8 +73,8 @@ STI KALY - blind
affected_mob.loc = pick(L)
smoke.start()
return
//Apparently it created a lagspike every time it was called -- Urist
return */
return
code/defines/obj/clothing.dm
+12 -1
View File
@@ -340,7 +340,7 @@
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
/obj/item/clothing/mask/clown_hat
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "You're gay for even considering wearing this."
icon_state = "clown"
@@ -955,3 +955,14 @@
/obj/item/clothing/under/shorts/grey
icon_state = "greyshorts"
color = "greyshorts"
// Belt slot clothing (only suspenders for now, because utility belt is a storage item)
/obj/item/clothing/belt
name = "belt"
icon = 'belts.dmi'
flags = FPRINT | TABLEPASS | ONBELT
/obj/item/clothing/belt/suspenders
name = "suspenders"
desc = "They suspend the illusion of the mime's play." //Meh -- Urist
icon_state = "suspenders"
code/defines/obj/storage.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/weapon/storage/utilitybelt
name = "utility belt"
desc = "Can hold various tools."
icon = 'old_or_unused.dmi'
icon = 'belts.dmi'
icon_state = "utilitybelt"
item_state = "utility"
can_hold = list("/obj/item/weapon/crowbar","/obj/item/weapon/screwdriver","/obj/item/weapon/weldingtool","/obj/item/weapon/wirecutters","/obj/item/weapon/wrench","/obj/item/device/multitool","/obj/item/device/flashlight","/obj/item/weapon/cable_coil")
code/game/gamemodes/events.dm
+22 -2
View File
@@ -230,10 +230,30 @@
A.power_environ = 1
A.power_change()
/proc/viral_outbreak()
/proc/viral_outbreak(var/virus = null)
command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
world << sound('outbreak7.ogg')
var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis)
var/virus_type
if(!virus)
virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis)
else
switch(virus)
if("fake gbs")
virus_type = /datum/disease/fake_gbs
if("gbs")
virus_type = /datum/disease/gbs
if("magnitis")
virus_type = /datum/disease/magnitis
if("wizarditis")
virus_type = /datum/disease/wizarditis
if("brain rot")
virus_type = /datum/disease/brainrot
if("cold")
virus_type = /datum/disease/cold
if("rhinovirus")
virus_type = /datum/disease/dnaspread
if("flu")
virus_type = /datum/disease/flu
for(var/mob/living/carbon/human/H in world)
if((H.virus) || (H.stat == 2))
continue
code/game/jobs/jobprocs.dm
+3 -2
View File
@@ -303,19 +303,20 @@
src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/clown(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/mask/clown_hat(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/weapon/banana(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
src.mutations |= 16
if ("Mime")
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_r_store)
src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
src.equip_if_possible(new /obj/item/clothing/mask/mime(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/belt/suspenders(src), slot_belt)
src.verbs += /client/proc/mimespeak
src.verbs += /client/proc/mimewall
src.miming = 1
code/game/supplyshuttle.dm
+2 -1
View File
@@ -153,8 +153,9 @@ var/supply_shuttle_points = 50
"/obj/item/weapon/storage/firstaid/syringes",
"/obj/item/weapon/storage/beakerbox")
cost = 20
containertype = "/obj/crate/freezer"
containertype = "/obj/crate/secure/weapon"
containername = "Virus crate"
access = access_heads
/datum/supply_packs/janitor
code/modules/admin/admin.dm
+10 -4
View File
@@ -1123,8 +1123,14 @@ var/showadminmessages = 1
alien_infestation()
message_admins("[key_name_admin(usr)] has spawned aliens", 1)
if("virus")
viral_outbreak()
message_admins("[key_name_admin(usr)] has spawned a virus outbreak", 1)
if(alert("Do you want this to be a random disease or do you have something in mind?",,"Random","Choose")=="Random")
viral_outbreak()
message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1)
else
var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","rhinovirus","flu")
var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses
viral_outbreak(V)
message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)
if("retardify")
if (src.rank in list("Shit Guy", "Coder", "Host"))
for(var/mob/living/carbon/human/H in world)
@@ -1161,7 +1167,7 @@ var/showadminmessages = 1
if("dorf")
if (src.rank in list("Shit Guy","Coder", "Host"))
for(var/mob/living/carbon/human/B in world)
B.face_icon_state = "facial_longbeard"
B.face_icon_state = "facial_wise"
B.update_face()
message_admins("[key_name_admin(usr)] activated dorf mode")
else
@@ -1494,7 +1500,7 @@ var/showadminmessages = 1
<A href='?src=\ref[src];secretsfun=timeanomalies'>Spawn wormholes (Untested)</A><BR>
<A href='?src=\ref[src];secretsfun=goblob'>Spawn magma(Untested)</A><BR>
<A href='?src=\ref[src];secretsfun=aliens'>Trigger an Alien infestation</A><BR>
<A href='?src=\ref[src];secretsfun=virus'>Trigger an Virus Outbreak</A><BR>
<A href='?src=\ref[src];secretsfun=virus'>Trigger a Virus Outbreak</A><BR>
<A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR>
<A href='?src=\ref[src];secretsfun=cleanexcrement'>Remove all urine/poo from station</A><BR>
<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>