Skip to content

Commit

Permalink
Added Vey's Jensen set+a shitty dermal "helmet" I made
Browse files Browse the repository at this point in the history
Removed the nurse outfit from the theatre cause it spawns in medbay anyway


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2430 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
kortgstation@gmail.com committed Oct 27, 2011
1 parent eba614d commit a255778
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 15 deletions.
4 changes: 2 additions & 2 deletions code/defines/obj/clothing/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@
new /obj/item/clothing/under/soviet(src.loc)
new /obj/item/clothing/head/ushanka(src.loc)
del(src)

/*
/obj/effect/landmark/costume/nurse/New()
new /obj/item/clothing/under/rank/nursesuit(src.loc)
new /obj/item/clothing/head/nursehat(src.loc)
new /obj/item/clothing/glasses/regular(src.loc)
new /obj/item/clothing/gloves/latex(src.loc)
new /obj/item/clothing/mask/surgical(src.loc)
del(src)
del(src)*/


/obj/effect/landmark/costume/imperium_monk/New()
Expand Down
9 changes: 9 additions & 0 deletions code/defines/obj/clothing/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,15 @@
flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)

/obj/item/clothing/head/helmet/dermal
name = "Dermal Armour Patch"
desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
icon_state = "dermal"
item_state = "dermal"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)


/obj/item/clothing/head/helmet/warden
name = "Warden Hat"
desc = "Stop right there, criminal scum!"
Expand Down
8 changes: 8 additions & 0 deletions code/defines/obj/clothing/jumpsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,14 @@
color = "scratch"


/obj/item/clothing/under/jensen
desc = "You never asked for anything this stylish."
name = "Head of Security Jumpsuit"
icon_state = "jensen"
item_state = "jensen"
color = "jensen"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)

/obj/item/clothing/under/sl_suit
desc = "A very amish looking suit."
name = "Amish Suit"
Expand Down
9 changes: 9 additions & 0 deletions code/defines/obj/clothing/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,15 @@
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
armor = list(melee = 65, bullet = 30, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)

/obj/item/clothing/suit/armor/jensen
name = "armored trenchoat"
desc = "A trenchoat augmented with a special alloy for some protection and style"
icon_state = "jensencoat"
item_state = "jensencoat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
armor = list(melee = 65, bullet = 30, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)

/obj/item/clothing/suit/armor/captain
name = "Captain's armor"
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/closets/secure/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
New()
..()
sleep(2)
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/under/jensen(src)
new /obj/item/clothing/suit/armor/jensen(src)
new /obj/item/clothing/head/helmet/dermal(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/storage/lockbox/loyalty(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/deadsay.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
if (!msg)
return

var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "HorPhareon", "LastFish", "unMportant", "Deurpyn" ) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "MissPhareon", "LastFish", "unMportant", "Deurpyn" ) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"

for (var/mob/M in world)
if (istype(M, /mob/new_player))
Expand Down
8 changes: 7 additions & 1 deletion code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,10 @@
name = "Optical Thermal Eyepatch"
desc = "An eyepatch with built-in thermal optics"
icon_state = "eyepatch"
item_state = "eyepatch"
item_state = "eyepatch"

/obj/item/clothing/glasses/thermal/jensen
name = "Optical Thermal Implants"
desc = "A set of implantable lenses designed to augment your vision"
icon_state = "thermalimplants"
item_state = "syringe_kit"
Binary file modified icons/mob/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/suit.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/glasses.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.
16 changes: 8 additions & 8 deletions maps/tgstation.2.0.8.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"abl" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/warden)
"abm" = (/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/woodentable,/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/hos)
"abn" = (/obj/machinery/atmospherics/unary/vent_scrubber,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos)
"abo" = (/obj/item/clothing/glasses/thermal,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "carpet"},/area/security/hos)
"abo" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/thermal/jensen,/turf/simulated/floor{icon_state = "carpet"},/area/security/hos)
"abp" = (/obj/item/weapon/stamp/hos,/obj/structure/table/woodentable,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos)
"abq" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/woodentable,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos)
"abr" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/item/device/radio/intercom{pixel_x = 28; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/hos)
Expand Down Expand Up @@ -5468,7 +5468,7 @@
"cbh" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start)
"cbi" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Space Station 13"},/area/start)
"cbj" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership)
"cbk" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
"cbk" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership)
"cbl" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership)
"cbm" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership)
"cbn" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership)
Expand Down Expand Up @@ -5540,8 +5540,8 @@
"ccB" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
"ccC" = (/turf/unsimulated/wall,/area/centcom)
"ccD" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
"ccE" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
"ccF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
"ccE" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area)
"ccF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom)
"ccG" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom)
"ccH" = (/turf/unsimulated/floor{name = "plating"},/area/centcom)
"ccI" = (/obj/structure/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
Expand Down Expand Up @@ -5601,7 +5601,7 @@
"cdK" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/suppy)
"cdL" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy)
"cdM" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/centcom/suppy)
"cdN" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
"cdN" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy)
"cdO" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
"cdP" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
"cdQ" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start)
Expand All @@ -5619,7 +5619,7 @@
"cec" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living)
"ced" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
"cee" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living)
"cef" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
"cef" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living)
"ceg" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/supply/dock)
"ceh" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/supply/dock)
"cei" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock)
Expand Down Expand Up @@ -5992,7 +5992,7 @@
"cll" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
"clm" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
"cln" = (/obj/machinery/computer/security,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
"clo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
"clo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry)
"clp" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/ferry)
"clq" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
"clr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry)
Expand All @@ -6002,7 +6002,7 @@
"clv" = (/obj/structure/stool/chair{dir = 8},/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control)
"clw" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
"clx" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
"cly" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry)
"cly" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry)
"clz" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/transport1/centcom)
"clA" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/transport1/centcom)
"clB" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/transport1/centcom)
Expand Down

0 comments on commit a255778

Please sign in to comment.