From 091936f0b524d41fb490cfd56a1ec3b882758d3e Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Sun, 8 Jan 2012 17:44:32 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Softcaps,=20flippable=20=E2=80=A2Impro?= =?UTF-8?q?ved=20bodybags,=20also=20changed=20sprites.=20Scream=20at=20me?= =?UTF-8?q?=20if=20you=20don't=20like=20them,=20I'll=20change=20them=20bac?= =?UTF-8?q?k.=20Also=20sorry=20for=20the=20114KB=20new=20sound.=20?= =?UTF-8?q?=E2=80=A2Sorry=20but=20I=20really=20have=20to=20defecate=20whil?= =?UTF-8?q?e=20writing=20this?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit •You can find the unused newscaster sprite of my new project in terminals.dmi git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2928 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/head.dm | 10 ++++++++-- code/defines/obj/machinery.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 3 ++- code/game/objects/bodybag.dm | 16 +++++++++++----- code/game/objects/closets.dm | 14 ++++++++++---- code/game/objects/items/clothing.dm | 17 +++++++++++++++++ html/changelog.html | 10 ++++++++++ icons/mob/head.dmi | Bin 75194 -> 75698 bytes icons/obj/bodybag.dmi | Bin 718 -> 4004 bytes icons/obj/clothing/hats.dmi | Bin 25402 -> 25849 bytes icons/obj/structures.dmi | Bin 45819 -> 45893 bytes icons/obj/terminals.dmi | Bin 12446 -> 16919 bytes maps/tgstation.2.0.8.dmm | 4 ++-- 14 files changed, 62 insertions(+), 16 deletions(-) diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index f14755faa6b..6d72e0ccb0a 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -92,6 +92,14 @@ flags = FPRINT|TABLEPASS|HEADCOVERSEYES item_state = "helmet" +/obj/item/clothing/head/cargosoft + name = "Cargo cap" + desc = "A baseball hat in tasteless yellow." + icon_state = "cargosoft" + flags = FPRINT|TABLEPASS|HEADCOVERSEYES + item_state = "helmet" + var/flipped = 0 + /obj/item/clothing/head/syndicatefake name = "red space helmet replica" icon_state = "syndicate" @@ -131,8 +139,6 @@ var/up = 0 armor = list(melee = 10, bullet = 5, laser = 10,energy = 5, bomb = 10, bio = 5, rad = 10) - - /obj/item/clothing/head/helmet/that name = "Sturdy Top hat" desc = "An amish looking armored top hat." diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 8b179519534..edfb6c7a5cd 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -379,7 +379,7 @@ /obj/machinery/hologram/holopad name = "AI holopad" - desc = "A floor-mounted device for projecting a holographic image. It will activate remotely." + desc = "A floor-mounted device for projecting a holographic image. It is activated remotely." icon_state = "holopad0" var mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 0fe117fb052..e2f75731660 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -19,7 +19,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() // 1 = assistance // 2 = supplies // 3 = info - // 4 = ass + sup + // 4 = ass + sup //Erro goddamn you just HAD to shorten "assistance" down to "ass" // 5 = ass + info // 6 = sup + info // 7 = ass + sup + info diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e4e2b2dfa50..371a9894d61 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -84,8 +84,9 @@ if(prob(50)) src.dump_everything() del(src) - return + return else + return return diff --git a/code/game/objects/bodybag.dm b/code/game/objects/bodybag.dm index 3c037b7b4f1..ecb80fda14a 100644 --- a/code/game/objects/bodybag.dm +++ b/code/game/objects/bodybag.dm @@ -39,10 +39,10 @@ density = 0 - attackby(P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/pen)) + attackby(W as obj, mob/user as mob) + if (istype(W, /obj/item/weapon/pen)) var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.equipped() != P) + if (user.equipped() != W) return if (!in_range(src, user) && src.loc != user) return @@ -50,10 +50,16 @@ if (t) src.name = "body bag - " src.name += t + src.overlays += image(src.icon, "bodybag_label") else src.name = "body bag" - ..() - return + //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri + return + else if(istype(W, /obj/item/weapon/wirecutters)) + user << "You cut the tag off the bodybag" + src.name = "body bag" + src.overlays = null + return close() diff --git a/code/game/objects/closets.dm b/code/game/objects/closets.dm index e1fd7c33405..6fdc4dfb632 100644 --- a/code/game/objects/closets.dm +++ b/code/game/objects/closets.dm @@ -37,7 +37,10 @@ src.icon_state = src.icon_opened src.opened = 1 - playsound(src.loc, 'click.ogg', 15, 1, -3) + if(istype(src, /obj/structure/closet/body_bag)) + playsound(src.loc, 'zip.wav', 15, 1, -3) + else + playsound(src.loc, 'click.ogg', 15, 1, -3) density = 0 return 1 @@ -64,7 +67,10 @@ M.loc = src src.icon_state = src.icon_closed src.opened = 0 - playsound(src.loc, 'click.ogg', 15, 1, -3) + if(istype(src, /obj/structure/closet/body_bag)) + playsound(src.loc, 'zip.wav', 15, 1, -3) + else + playsound(src.loc, 'click.ogg', 15, 1, -3) density = 1 return 1 @@ -130,7 +136,7 @@ if(istype(W, /obj/item/weapon/grab)) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet - if(istype(W, /obj/item/weapon/weldingtool) && W:welding) + if(istype(W, /obj/item/weapon/weldingtool) && W:welding ) if(!W:remove_fuel(0,user)) user << "\blue You need more welding fuel to complete this task." return @@ -148,7 +154,7 @@ if(W) W.loc = src.loc - else if(istype(W, /obj/item/weapon/weldingtool) && W:welding) + else if(istype(W, /obj/item/weapon/weldingtool) && W:welding ) if(!W:remove_fuel(0,user)) user << "\blue You need more welding fuel to complete this task." return diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index ca6f4b16159..24b34fcf691 100644 --- a/code/game/objects/items/clothing.dm +++ b/code/game/objects/items/clothing.dm @@ -264,6 +264,23 @@ THERMAL GLASSES icon_state = "weldingup" usr << "You push the mask up out of your face." +/obj/item/clothing/head/cargosoft/dropped() + src.icon_state = "cargosoft" + src.flipped=0 + ..() + +/obj/item/clothing/head/cargosoft/verb/flip() + set category = "Object" + set name = "Flip cap" + src.flipped = !src.flipped + if(src.flipped) + icon_state = "cargosoft_flipped" + usr << "You flip the hat backwards." + else + icon_state = "cargosoft" + usr << "You flip the hat back in normal position." + + /obj/item/clothing/shoes/magboots/verb/toggle() set name = "Toggle Magboots" set category = "Object" diff --git a/html/changelog.html b/html/changelog.html index 6d89da4effb..6b665c64d7d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,6 +60,16 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> +8 January 2012 +
    +
  • Agouri updated: +
      +
    • I'm back home and resumed work on Newscasters and Contraband.
      • +
    • But I got bored and made cargo softcaps instead. Flippable! Enjoy, now all we need is deliverable pizzas.
      • +
    • Oh, also enjoy some new bodybag functionality and sounds I had ready a while ago, with sprites from Farart. Use a pen to create a visible tag on the bodybag. Wirecutters to cut it off. Also it's no longer weldable because it makes no goddamn sense. +
    +
+ 7 January 2012