cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added department headsets to secure lockers in engineering, security, detective, and medical.

Browse Source 
Changed icons of RD and CMO secure closets.
Added a medical wardrobe closet to Med Bay.
Moved toy icons to toy.dmi.
Renamed Invisibility to Ethereal Jaunt.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@573 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-09 03:32:45 +00:00
parent a4dee066cb
commit 0bbfc0bfa6
11 changed files with 5940 additions and 5931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/defines/obj/closet.dm
View File

@@ -281,24 +281,16 @@
icon_off = "medical1"
req_access = list(access_medical)
/obj/secure_closet/medical3
name = "Medical Garb"
req_access = list(access_medical)
/obj/secure_closet/RD
name = "Research Director"
icon_state = "medical1"
icon_closed = "medical"
icon_locked = "medical1"
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medical1"
req_access = list(access_rd)
/obj/secure_closet/CMO
name = "Chief Medical Officer"
icon_state = "medical1"
icon_closed = "medical"
icon_locked = "medical1"
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medical1"
req_access = list(access_cmo)
/obj/secure_closet/personal

14
code/defines/obj/toy.dm
View File

@@ -14,8 +14,8 @@ obj/item/toy/blink
/obj/item/toy/ammo/gun
name = "ammo-caps"
desc = "There are 7 caps left!"
icon = 'ammo.dmi'
icon_state = "357-7"
icon = 'toy.dmi'
icon_state = "caps-7"
flags = FPRINT | TABLEPASS| CONDUCT
w_class = 1.0
var/amount_left = 7.0
@@ -45,8 +45,8 @@ obj/item/toy/blink
/obj/item/toy/gun
name = "cap gun"
desc = "There are 0 caps left. Looks just like the real thing!"
icon = 'gun.dmi'
icon_state = "revolver"
icon = 'toy.dmi'
icon_state = "capgun"
item_state = "gun"
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY
w_class = 3.0
@@ -98,7 +98,7 @@ obj/item/toy/blink
/obj/item/toy/sword
name = "toy sword"
desc = "a cheap plastic replica of an energy sword."
icon = 'weapons.dmi'
icon = 'toy.dmi'
icon_state = "sword0"
var/active = 0.0
w_class = 2.0
@@ -120,8 +120,8 @@ obj/item/toy/blink
/obj/item/toy/crossbow
name = "foam dart crossbow"
desc = "A weapon favored by many overactive children."
icon = 'gun.dmi'
icon_state = "crossbow"
icon = 'toy.dmi'
icon_state = "foamcrossbow"
item_state = "crossbow"
flags = FPRINT | TABLEPASS | USEDELAY
w_class = 2.0

23
code/game/gamemodes/wizard/spell11.dm
View File

@@ -1,6 +1,6 @@
/client/proc/invisibility()
/client/proc/jaunt()
set category = "Spells"
set name = "Invisibility"
set name = "Ethereal Jaunt"
if(usr.stat)
usr << "Not when you're incapicated."
return
@@ -14,19 +14,19 @@
usr << "I don't feel strong enough without my hat."
return
usr.verbs -= /client/proc/invisibility
usr.verbs -= /client/proc/jaunt
spawn(300)
usr.verbs += /client/proc/invisibility
usr.verbs += /client/proc/jaunt
spell_invisibility(usr)
spell_jaunt(usr)
/proc/spell_invisibility(var/mob/H, time = 50)
/proc/spell_jaunt(var/mob/H, time = 50)
if(H.stat) return
spawn(0)
var/mobloc = get_turf(H.loc)
var/obj/dummy/spell_invis/holder = new /obj/dummy/spell_invis( mobloc )
var/obj/dummy/spell_jaunt/holder = new /obj/dummy/spell_jaunt( mobloc )
var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
animation.name = "water"
animation.density = 0
@@ -56,16 +56,15 @@
del(animation)
del(holder)
/obj/dummy/spell_invis
/obj/dummy/spell_jaunt
name = "water"
icon = 'effects.dmi'
icon_state = "nothing"
invisibility = 101
var/canmove = 1
density = 0
anchored = 1
/obj/dummy/spell_invis/relaymove(var/mob/user, direction)
/obj/dummy/spell_jaunt/relaymove(var/mob/user, direction)
if (!src.canmove) return
switch(direction)
if(NORTH)
@@ -91,7 +90,7 @@
src.canmove = 0
spawn(2) src.canmove = 1
/obj/dummy/spell_invis/ex_act(blah)
/obj/dummy/spell_jaunt/ex_act(blah)
return
/obj/dummy/spell_invis/bullet_act(blah,blah)
/obj/dummy/spell_jaunt/bullet_act(blah,blah)
return

14
code/game/gamemodes/wizard/wizard.dm
View File

@@ -152,7 +152,7 @@
/datum/game_mode/wizard/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
if (!istype(wizard_mob))
return
wizard_mob.verbs += /client/proc/invisibility
wizard_mob.verbs += /client/proc/jaunt
if (wizard_mob.mind.assigned_role == "Clown")
wizard_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
wizard_mob.mutations &= ~16
@@ -351,7 +351,7 @@
dat += "<A href='byond://?src=\ref[src];spell_blink=1'>Blink</A> (2)<BR>"
dat += "<A href='byond://?src=\ref[src];spell_teleport=1'>Teleport</A> (30)<BR>"
dat += "<A href='byond://?src=\ref[src];spell_mutate=1'>Mutate</A> (60)<BR>"
dat += "<A href='byond://?src=\ref[src];spell_invis=1'>Invisibility</A> (60)<BR>"
dat += "<A href='byond://?src=\ref[src];spell_jaunt=1'>Ethereal Jaunt</A> (60)<BR>"
dat += "<A href='byond://?src=\ref[src];spell_knock=1'>Knock</A> (10)<BR>"
dat += "<HR>"
if (src.origradio)
@@ -421,10 +421,10 @@
src.uses -= 1
usr.verbs += /client/proc/mutate
src.temp = "This spell causes you to turn into a hulk, and gain telekinesis for a short while."
else if (href_list["spell_invis"])
else if (href_list["spell_jaunt"])
if (src.uses >= 1)
src.uses -= 1
usr.verbs += /client/proc/invisibility
usr.verbs += /client/proc/jaunt
src.temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
else if (href_list["spell_knock"])
if (src.uses >= 1)
@@ -498,7 +498,7 @@
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=blink'>Blink</A> (2)<BR>"
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=teleport'>Teleport</A> (30)<BR>"
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=mutate'>Mutate</A> (60)<BR>"
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=invis'>Invisibility</A> (60)<BR>"
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=jaunt'>Ethereal Jaunt</A> (60)<BR>"
src.menu_message += "<A href='byond://?src=\ref[src];buy_spell=knock'>Knock</A> (10)<BR>"
src.menu_message += "<HR>"
return
@@ -562,10 +562,10 @@
src.uses -= 1
usr.verbs += /client/proc/mutate
src.temp = "This spell causes you to turn into a hulk, and gain telekinesis for a short while."
if("invis")
if("jaunt")
if (src.uses >= 1)
src.uses -= 1
usr.verbs += /client/proc/invisibility
usr.verbs += /client/proc/jaunt
src.temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
if("knock")
if (src.uses >= 1)

1
code/game/objects/closets/secure/engineering.dm
View File

@@ -46,6 +46,7 @@
..()
sleep(2)
new /obj/item/weapon/storage/toolbox/mechanical( src )
new /obj/item/device/radio/headset/headset_eng( src )
new /obj/item/clothing/under/rank/engineer( src )
new /obj/item/clothing/shoes/orange( src )
new /obj/item/clothing/mask/gas( src )

17
code/game/objects/closets/secure/medical.dm
View File

@@ -32,6 +32,23 @@
new /obj/item/clothing/mask/medical( src )
return
/obj/secure_closet/medical3/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_med( src )
new /obj/item/device/radio/headset/headset_med( src )
new /obj/item/device/radio/headset/headset_med( src )
new /obj/item/clothing/under/rank/medical( src )
new /obj/item/clothing/under/rank/medical( src )
new /obj/item/clothing/under/rank/medical( src )
new /obj/item/clothing/suit/labcoat( src )
new /obj/item/clothing/suit/labcoat( src )
new /obj/item/clothing/suit/labcoat( src )
new /obj/item/clothing/mask/medical( src )
new /obj/item/clothing/mask/medical( src )
new /obj/item/clothing/mask/medical( src )
return
/obj/secure_closet/CMO/New()
..()
sleep(2)

3
code/game/objects/closets/secure/security.dm
View File

@@ -3,8 +3,8 @@
sleep(2)
//new /obj/item/weapon/storage/flashbang_kit(src)
// Seriously gimping the number of flashes security get, will probably change later -- TLE
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/weapon/flashbang(src)
// new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/gun/energy/taser_gun(src)
new /obj/item/device/flash(src)
@@ -23,6 +23,7 @@
/obj/secure_closet/security2/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/under/det( src )
new /obj/item/clothing/shoes/brown( src )
new /obj/item/clothing/head/det_hat( src )