cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 05:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from skull132/master

Browse Source 
Map, items and HUDs
This commit is contained in:
skull132
2014-07-05 20:56:15 +03:00
parent a71ea40047 8df67ef26c
commit eb88e00abe
9 changed files with 8203 additions and 8156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/glasses.dm
+18
View File
@@ -64,6 +64,24 @@
item_state = "glasses"
prescription = 1
/obj/item/clothing/glasses/regular/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/clothing/glasses/hud/health))
user.drop_item()
del(W)
user << "<span class='notice'>You attach a set of medical HUDs to your glasses.</span>"
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health/prescription(T)
user.drop_from_inventory(src)
del(src)
if(istype(W, /obj/item/clothing/glasses/hud/security))
user.drop_item()
del(W)
user << "<span class='notice'>You attach a set of security HUDs to your glasses.</span>"
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/security/prescription(T)
user.drop_from_inventory(src)
del(src)
/obj/item/clothing/glasses/regular/hipster
name = "Prescription Glasses"
desc = "Made by Uncool. Co."
code/modules/clothing/glasses/hud.dm
+30 -1
View File
@@ -27,12 +27,41 @@
C.images += patient.hud_list[HEALTH_HUD]
C.images += patient.hud_list[STATUS_HUD]
/obj/item/clothing/glasses/hud/health/prescription
name = "prescription glasses/HUD assembly"
desc = "A medical HUD clipped onto the side of prescription glasses."
prescription = 1
icon_state = "healthhudpresc"
item_state = "healthhudpresc"
/obj/item/clothing/glasses/hud/health/prescription/attack_self(mob/user)
user << "<span class='notice'>You detach a set of medical HUDs form your glasses.</span>"
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health(T)
new /obj/item/clothing/glasses/regular(T)
user.drop_item(src)
del(src)
/obj/item/clothing/glasses/hud/security
name = "Security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
var/global/list/jobs[0]
var/global/list/jobs[0]
/obj/item/clothing/glasses/hud/security/prescription
name = "prescription glasses/HUD assembly"
desc = "A security HUD clipped onto the side of prescription glasses."
prescription = 1
icon_state = "sechudpresc"
item_state = "sechudpresc"
/obj/item/clothing/glasses/hud/security/prescription/attack_self(mob/user)
user << "<span class='notice'>You detach a set of medical HUDs form your glasses.</span>"
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health(T)
new /obj/item/clothing/glasses/regular(T)
user.drop_item(src)
del(src)
/obj/item/clothing/glasses/hud/security/jensenshades
name = "Augmented shades"
code/modules/customitems/item_defines.dm
+27 -22
View File
@@ -674,32 +674,18 @@
reagents.add_reagent("space_drugs", 5)
reagents.add_reagent("paroxetine", 5)
/obj/item/clothing/tie/storage/fluff/cecillia_locket/attackby(/*var/obj/item/O as obj, mob/user as mob*/)
..()
update()
/obj/item/clothing/tie/storage/fluff/cecillia_locket/proc/update()
var/count = 0
for(var/obj/item/I in hold)
if(istype(I,/obj/item/weapon/reagent_containers/pill/))
count++
if(count>1) count = 1
item_state = "cecillia_locket[count]"
icon_state = item_state
item_color = item_state
if(istype(loc, /obj/item/clothing))
var/obj/item/clothing/U = loc
if(istype(U.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = U.loc
H.update_inv_w_uniform()
/obj/item/clothing/tie/storage/fluff/cecillia_locket/New()
..()
new /obj/item/weapon/reagent_containers/pill/cecillia_pill(hold)
return
/obj/item/weapon/storage/backpack/satchel/fluff/cecillia_satchel //Satchel-bag - Cecillia Lambert - casperf1 - SPRITE
name = "satchel-bag"
desc = "This looks old, is not yours and if you're wearing it, the original owner is probably dead."
icon = 'icons/obj/custom_items.dmi'
icon_state = "cecillia_satchel"
item_state = "cecillia_satchel"
/obj/item/clothing/glasses/regular/fluff/cecillia_glasses //Red prescription glasses - Cecillia Lamber - casperf1 - DONE
name = "red prescription glasses"
desc = "These glasses have been prescribed for a terrible pair of eyes."
@@ -712,4 +698,23 @@
desc = "An old red and black winter-coat, there looks to be spots of dried blood on it."
icon = 'icons/obj/custom_items.dmi'
icon_state = "temple_coat"
item_state = "temple_coat"
item_state = "temple_coat"
/obj/item/clothing/shoes/jackboots/fluff/peter_boots //Worn boots - Peter Thrushwood - farcry11 - DONE
name = "worn boots"
desc = "A worn pair of combat boots. They look walked-around in."
/obj/item/clothing/gloves/brown/fluff/peter_gloves //Cropped driving hloves - Peter Thrushwood - farcry11 - DONE
name = "cropped driving gloves"
desc = "A pair of high quality, fingerless driving gloves made of faux leather and faux velvet-leathern without and velvet within."
icon = 'icons/obj/custom_items.dmi'
icon_state = "peter_gloves"
item_state = "peter gloves"
clipped = 1
/obj/item/clothing/under/fluff/peter_shirt //Plaid shirt - Peter Thrushwood - farcry11 - DONE
name = "plaid shirt"
desc = "A worn and rugged looking plaid button-up overshirt. The initials 'P.T.' are scrawled in pen on the neck tag."
icon_state = "sl_suit"
item_state = "sl_suit"
item_color = "sl_suit"