- Redesigned QM office

- Cargo bay now has a second ordering console there so cargo techs aren't utterly useless
- Mining camera computer now uses the proper sprite ingame too, not just in the editor.
- Mining camera computer now actually displays the mining level's cameras.
- Mining office access level removed from ID computer and the map.
- Clicking on paper now examines is (displays it's text)
- To rename paper pick it up and use the 'rename paper' verb
- Rad suit crate spawn order switched so it spawns suit-helmet-suit-helmet-... to make dressing slightly easier (you don't need to use move to top or drag stuff out)
- blabla crate renamed to juice crate. (I hope to never see a 'blabla' thing in committed code again!)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1772 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2011-07-05 16:27:56 +00:00
parent 8c8ed289c1
commit a4b4117e17
6 changed files with 5372 additions and 5353 deletions
+15 -8
View File
@@ -190,16 +190,23 @@ CLIPBOARDS
attack_self(usr)
return
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
if ((user.mutations & CLOWN) && prob(50))
user << text("\red You cut yourself on the paper.")
user.take_organ_damage(3)
/obj/item/weapon/paper/verb/rename()
set name = "Rename paper"
set category = "Object"
set src in usr
if ((usr.mutations & CLOWN) && prob(50))
usr << text("\red You cut yourself on the paper.")
return
var/n_name = input(user, "What would you like to label the paper?", "Paper Labelling", null) as text
var/n_name = input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text
n_name = copytext(n_name, 1, 32)
if ((src.loc == user && user.stat == 0))
src.name = text("paper[]", (n_name ? text("- '[]'", n_name) : null))
src.add_fingerprint(user)
if ((src.loc == usr && usr.stat == 0))
src.name = text("paper[]", (n_name ? text("- '[n_name]'") : null))
src.add_fingerprint(usr)
return
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
examine()
return
/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
+3 -3
View File
@@ -197,12 +197,12 @@
/obj/crate/radiation/New()
..()
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
/obj/crate/proc/open()