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

TG: Steel renamed to plasteel.

Browse Source 
Having more than 100 burn damage and being dead now makes you a husk. r2925
Author: 	 uporotiy
This commit is contained in:
Ren Erthilo
2012-04-09 17:15:57 +01:00
parent d7cf9d51f2
commit 7cb6114eff
23 changed files with 14878 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baystation12.dme
View File

@@ -514,7 +514,7 @@
#include "code\game\machinery\bots\medbot.dm" #include "code\game\machinery\bots\medbot.dm"
#include "code\game\machinery\bots\mulebot.dm" #include "code\game\machinery\bots\mulebot.dm"
#include "code\game\machinery\bots\secbot.dm" #include "code\game\machinery\bots\secbot.dm"
#include "code\game\machinery\computer\AIcore.dm" #include "code\game\machinery\computer\ai_core.dm"
#include "code\game\machinery\computer\aifixer.dm" #include "code\game\machinery\computer\aifixer.dm"
#include "code\game\machinery\computer\arcade.dm" #include "code\game\machinery\computer\arcade.dm"
#include "code\game\machinery\computer\atmos.dm" #include "code\game\machinery\computer\atmos.dm"

25
code/defines/obj.dm
View File

@@ -1320,31 +1320,6 @@
throwforce = 14.0 throwforce = 14.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS | CONDUCT
/obj/item/stack/sheet/r_metal
name = "steel"
singular_name = "steel sheet"
desc = "This sheet is an alloy of iron and plasma."
icon_state = "sheet-r_metal"
item_state = "sheet-metal"
m_amt = 7500
throwforce = 15.0
flags = FPRINT | TABLEPASS | CONDUCT
origin_tech = "materials=2"
/obj/item/stack/tile/steel
name = "Metal floor tile"
singular_name = "Steel floor tile"
desc = "Those could work as a pretty decent throwing weapon"
icon_state = "tile"
w_class = 3.0
force = 6.0
m_amt = 937.5
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT
max_amount = 60
/obj/item/stack/sheet/plasteel /obj/item/stack/sheet/plasteel
name = "plasteel" name = "plasteel"
singular_name = "plasteel sheet" singular_name = "plasteel sheet"

2
code/defines/obj/storage.dm
View File

@@ -161,7 +161,7 @@
var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src) var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src)
G.amount = 50 G.amount = 50
G.loc = src G.loc = src
var/obj/item/stack/sheet/r_metal/R = new /obj/item/stack/sheet/r_metal(src) var/obj/item/stack/sheet/plasteel/R = new /obj/item/stack/sheet/plasteel(src)
R.amount = 50 R.amount = 50
R.loc = src R.loc = src
var/obj/item/weapon/storage/box/B1 = new /obj/item/weapon/storage/box(src) var/obj/item/weapon/storage/box/B1 = new /obj/item/weapon/storage/box(src)

6
code/defines/turf.dm
View File

@@ -1,6 +1,6 @@
/turf /turf
icon = 'floors.dmi' icon = 'floors.dmi'
var/intact = 1 //for floors, use is_plating(), is_steel_floor() and is_light_floor() var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor()
level = 1.0 level = 1.0
@@ -26,7 +26,7 @@
return 0 return 0
proc/is_asteroid_floor() proc/is_asteroid_floor()
return 0 return 0
proc/is_steel_floor() proc/is_plasteel_floor()
return 0 return 0
proc/is_light_floor() proc/is_light_floor()
return 0 return 0
@@ -82,7 +82,7 @@
blocks_air = 1 blocks_air = 1
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m steel wall heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
var/walltype = "wall" var/walltype = "wall"

24
code/game/machinery/bots/floorbot.dm
View File

@@ -99,8 +99,8 @@
/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob) /obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob)
if(istype(W, /obj/item/stack/tile/steel)) if(istype(W, /obj/item/stack/tile/plasteel))
var/obj/item/stack/tile/steel/T = W var/obj/item/stack/tile/plasteel/T = W
if(src.amount >= 50) if(src.amount >= 50)
return return
var/loaded = min(50-src.amount, T.amount) var/loaded = min(50-src.amount, T.amount)
@@ -169,7 +169,7 @@
floorbottargets += bot.target floorbottargets += bot.target
if(src.amount <= 0 && ((src.target == null) || !src.target)) if(src.amount <= 0 && ((src.target == null) || !src.target))
if(src.eattiles) if(src.eattiles)
for(var/obj/item/stack/tile/steel/T in view(7, src)) for(var/obj/item/stack/tile/plasteel/T in view(7, src))
if(T != src.oldtarget && !(target in floorbottargets)) if(T != src.oldtarget && !(target in floorbottargets))
src.oldtarget = T src.oldtarget = T
src.target = T src.target = T
@@ -215,7 +215,7 @@
src.target = F src.target = F
break break
if((!src.target || src.target == null) && src.eattiles) if((!src.target || src.target == null) && src.eattiles)
for(var/obj/item/stack/tile/steel/T in view(7, src)) for(var/obj/item/stack/tile/plasteel/T in view(7, src))
if(!(T in floorbottargets) && T != src.oldtarget) if(!(T in floorbottargets) && T != src.oldtarget)
src.oldtarget = T src.oldtarget = T
src.target = T src.target = T
@@ -245,7 +245,7 @@
src.path = new() src.path = new()
if(src.loc == src.target || src.loc == src.target.loc) if(src.loc == src.target || src.loc == src.target.loc)
if(istype(src.target, /obj/item/stack/tile/steel)) if(istype(src.target, /obj/item/stack/tile/plasteel))
src.eattile(src.target) src.eattile(src.target)
else if(istype(src.target, /obj/item/stack/sheet/metal)) else if(istype(src.target, /obj/item/stack/sheet/metal))
src.maketile(src.target) src.maketile(src.target)
@@ -270,7 +270,7 @@
if(istype(target, /turf/space/)) if(istype(target, /turf/space/))
for(var/mob/O in viewers(src, null)) for(var/mob/O in viewers(src, null))
O.show_message(text("\red [src] begins to repair the hole"), 1) O.show_message(text("\red [src] begins to repair the hole"), 1)
var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
src.repairing = 1 src.repairing = 1
spawn(50) spawn(50)
T.build(src.loc) T.build(src.loc)
@@ -291,8 +291,8 @@
src.anchored = 0 src.anchored = 0
src.target = null src.target = null
/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/steel/T) /obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
if(!istype(T, /obj/item/stack/tile/steel)) if(!istype(T, /obj/item/stack/tile/plasteel))
return return
for(var/mob/O in viewers(src, null)) for(var/mob/O in viewers(src, null))
O.show_message(text("\red [src] begins to collect tiles."), 1) O.show_message(text("\red [src] begins to collect tiles."), 1)
@@ -326,7 +326,7 @@
src.target = null src.target = null
src.repairing = 0 src.repairing = 0
return return
var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
T.amount = 4 T.amount = 4
T.loc = M.loc T.loc = M.loc
del(M) del(M)
@@ -353,7 +353,7 @@
new /obj/item/robot_parts/l_arm(Tsec) new /obj/item/robot_parts/l_arm(Tsec)
if (amount) if (amount)
new /obj/item/stack/tile/steel(Tsec) // only one tile, yes new /obj/item/stack/tile/plasteel(Tsec) // only one tile, yes
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src) s.set_up(3, 1, src)
@@ -362,8 +362,8 @@
return return
/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/steel/T, mob/user as mob) /obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob)
if(!istype(T, /obj/item/stack/tile/steel)) if(!istype(T, /obj/item/stack/tile/plasteel))
..() ..()
return return
if(src.contents.len >= 1) if(src.contents.len >= 1)

2
code/game/machinery/computer/AIcore.dm → code/game/machinery/computer/ai_core.dm
View File

@@ -24,7 +24,7 @@
P:welding = 2 P:welding = 2
if(do_after(user, 20)) if(do_after(user, 20))
user << "\blue You deconstruct the frame." user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/r_metal( loc, 4) new /obj/item/stack/sheet/plasteel( loc, 4)
del(src) del(src)
P:welding = 1 P:welding = 1
if(1) if(1)

6
code/game/machinery/suit_storage_unit.dm
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////// //////////////////////////////////////
// SUIT STORAGE UNIT :3 ///////////////// // SUIT STORAGE UNIT /////////////////
///////////////////////////////////////// //////////////////////////////////////
/obj/machinery/suit_storage_unit /obj/machinery/suit_storage_unit

16
code/game/mecha/mecha_construction_paths.dm
View File

@@ -110,7 +110,7 @@
"backkey"=/obj/item/weapon/crowbar, "backkey"=/obj/item/weapon/crowbar,
"desc"="External armor is installed."), "desc"="External armor is installed."),
//3 //3
list("key"=/obj/item/stack/sheet/r_metal, list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/weldingtool, "backkey"=/obj/item/weapon/weldingtool,
"desc"="Internal armor is welded."), "desc"="Internal armor is welded."),
//4 //4
@@ -261,7 +261,7 @@
user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.") user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
else else
user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].") user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].")
var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder)) var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
MS.amount = 5 MS.amount = 5
if(1) if(1)
if(diff==FORWARD) if(diff==FORWARD)
@@ -557,11 +557,11 @@
"backkey"=/obj/item/weapon/crowbar, "backkey"=/obj/item/weapon/crowbar,
"desc"="External armor is installed."), "desc"="External armor is installed."),
//3 //3
list("key"=/obj/item/stack/sheet/r_metal, list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/crowbar, "backkey"=/obj/item/weapon/crowbar,
"desc"="External armor is being installed."), "desc"="External armor is being installed."),
//4 //4
list("key"=/obj/item/stack/sheet/r_metal, list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/weldingtool, "backkey"=/obj/item/weapon/weldingtool,
"desc"="Internal armor is welded."), "desc"="Internal armor is welded."),
//5 //5
@@ -574,7 +574,7 @@
"desc"="Internal armor is installed"), "desc"="Internal armor is installed"),
//7 //7
list("key"=/obj/item/stack/sheet/r_metal, list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/screwdriver, "backkey"=/obj/item/weapon/screwdriver,
"desc"="Peripherals control module is secured"), "desc"="Peripherals control module is secured"),
//8 //8
@@ -673,7 +673,7 @@
user.visible_message("[user] secures internal armor layer.", "You secure internal armor layer.") user.visible_message("[user] secures internal armor layer.", "You secure internal armor layer.")
else else
user.visible_message("[user] pries internal armor layer from [holder].", "You prie internal armor layer from [holder].") user.visible_message("[user] pries internal armor layer from [holder].", "You prie internal armor layer from [holder].")
var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder)) var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
MS.amount = 5 MS.amount = 5
if(5) if(5)
if(diff==FORWARD) if(diff==FORWARD)
@@ -690,14 +690,14 @@
user.visible_message("[user] installs external reinforced armor layer to [holder].", "You install external reinforced armor layer to [holder].") user.visible_message("[user] installs external reinforced armor layer to [holder].", "You install external reinforced armor layer to [holder].")
else else
user.visible_message("[user] removes the external armor from [holder].", "You remove the external armor from [holder].") user.visible_message("[user] removes the external armor from [holder].", "You remove the external armor from [holder].")
var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder)) var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
MS.amount = 5 MS.amount = 5
if(2) if(2)
if(diff==FORWARD) if(diff==FORWARD)
user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.") user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
else else
user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].") user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].")
var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder)) var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
MS.amount = 5 MS.amount = 5
if(1) if(1)
if(diff==FORWARD) if(diff==FORWARD)

2
code/game/mecha/mecha_wreckage.dm
View File

@@ -10,7 +10,7 @@
density = 1 density = 1
anchored = 0 anchored = 0
opacity = 0 opacity = 0
var/list/welder_salvage = list(/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/metal,/obj/item/stack/rods) var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/metal,/obj/item/stack/rods)
var/list/wirecutters_salvage = list(/obj/item/weapon/cable_coil) var/list/wirecutters_salvage = list(/obj/item/weapon/cable_coil)
var/list/crowbar_salvage var/list/crowbar_salvage
var/salvage_num = 5 var/salvage_num = 5

2
code/game/objects/items/weapons/table_rack_parts.dm
View File

@@ -42,7 +42,7 @@ RACK PARTS
/obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()
if (istype(W, /obj/item/weapon/wrench)) if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/r_metal( src.loc ) new /obj/item/stack/sheet/plasteel( src.loc )
//SN src = null //SN src = null
del(src) del(src)

14
code/game/objects/stacks/metal.dm
View File

@@ -71,7 +71,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
null, \ null, \
new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 2, one_per_turf = 1), \ new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 2, one_per_turf = 1), \
null, \ null, \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/steel, 1, 4, 10), \ new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 10), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \ new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
null, \ null, \
new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, one_per_turf = 1), \ new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, one_per_turf = 1), \
@@ -98,27 +98,27 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
// REINFORCED METAL SHEET // REINFORCED METAL SHEET
// /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0) // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0)
var/global/list/datum/stack_recipe/r_metal_recipes = list ( \ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \
) )
/obj/item/stack/sheet/r_metal /obj/item/stack/sheet/plasteel
New(var/loc, var/amount=null) New(var/loc, var/amount=null)
recipes = r_metal_recipes recipes = plasteel_recipes
return ..() return ..()
// TILES // TILES
/obj/item/stack/tile/steel/New(var/loc, var/amount=null) /obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
..() ..()
src.pixel_x = rand(1, 14) src.pixel_x = rand(1, 14)
src.pixel_y = rand(1, 14) src.pixel_y = rand(1, 14)
return return
/obj/item/stack/tile/steel/attack_self(mob/user as mob) /obj/item/stack/tile/plasteel/attack_self(mob/user as mob)
if (usr.stat) if (usr.stat)
return return
var/T = user.loc var/T = user.loc
@@ -133,7 +133,7 @@ var/global/list/datum/stack_recipe/r_metal_recipes = list ( \
use(1) use(1)
return return
/obj/item/stack/tile/steel/proc/build(turf/S as turf) /obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
S.ReplaceWithPlating() S.ReplaceWithPlating()
// var/turf/simulated/floor/W = S.ReplaceWithFloor() // var/turf/simulated/floor/W = S.ReplaceWithFloor()
// W.make_plating() // W.make_plating()

8
code/game/objects/structures.dm
View File

@@ -33,12 +33,14 @@ obj/structure
W:use(2) W:use(2)
user << "\blue You create a false wall! Push on it to open or close the passage." user << "\blue You create a false wall! Push on it to open or close the passage."
new /obj/structure/falsewall (src.loc) new /obj/structure/falsewall (src.loc)
add_hiddenprint(usr)
del(src) del(src)
else if(istype(W, /obj/item/stack/sheet/r_metal) && istype(src,/obj/structure/girder/displaced)) else if(istype(W, /obj/item/stack/sheet/plasteel) && istype(src,/obj/structure/girder/displaced))
W:use(2) W:use(2)
user << "\blue You create a false r wall! Push on it to open or close the passage." user << "\blue You create a false r wall! Push on it to open or close the passage."
new /obj/structure/falserwall (src.loc) new /obj/structure/falserwall (src.loc)
add_hiddenprint(usr)
del(src) del(src)
else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced)) else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
@@ -86,7 +88,7 @@ obj/structure
del(src) del(src)
return return
else if (istype(W, /obj/item/stack/sheet/r_metal)) else if (istype(W, /obj/item/stack/sheet/plasteel))
if (src.icon_state == "reinforced") //Time to finalize! if (src.icon_state == "reinforced") //Time to finalize!
user << "\blue Now finalising reinforced wall." user << "\blue Now finalising reinforced wall."
if(do_after(user, 50)) if(do_after(user, 50))
@@ -176,7 +178,7 @@ obj/structure
/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob) /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
if (istype(C, /obj/item/stack/tile)) if (istype(C, /obj/item/stack/tile/plasteel))
C:build(get_turf(src)) C:build(get_turf(src))
C:use(1) C:use(1)

41
code/game/turf.dm
View File

@@ -283,11 +283,11 @@
if(!devastated) if(!devastated)
playsound(src.loc, 'Welder.ogg', 100, 1) playsound(src.loc, 'Welder.ogg', 100, 1)
new /obj/structure/girder/reinforced(src) new /obj/structure/girder/reinforced(src)
new /obj/item/stack/sheet/r_metal( src ) new /obj/item/stack/sheet/plasteel( src )
else else
new /obj/item/stack/sheet/metal( src ) new /obj/item/stack/sheet/metal( src )
new /obj/item/stack/sheet/metal( src ) new /obj/item/stack/sheet/metal( src )
new /obj/item/stack/sheet/r_metal( src ) new /obj/item/stack/sheet/plasteel( src )
else else
if(!devastated) if(!devastated)
playsound(src.loc, 'Welder.ogg', 100, 1) playsound(src.loc, 'Welder.ogg', 100, 1)
@@ -481,6 +481,7 @@
if(!istype(src, /turf/simulated/wall/r_wall)) if(!istype(src, /turf/simulated/wall/r_wall))
return // this may seem stupid and redundant but apparently floors can call this attackby() proc, it was spamming shit up. -- Doohl return // this may seem stupid and redundant but apparently floors can call this attackby() proc, it was spamming shit up. -- Doohl
if (istype(W, /obj/item/weapon/weldingtool) && W:welding) if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
W:eyecheck(user) W:eyecheck(user)
var/turf/T = user.loc var/turf/T = user.loc
@@ -675,7 +676,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
/turf/simulated/floor /turf/simulated/floor
//Note to coders, the 'intact' var can no longer be used to determine if the floor is a plating or not. //Note to coders, the 'intact' var can no longer be used to determine if the floor is a plating or not.
//Use the is_plating(), is_steel_floor() and is_light_floor() procs instead. --Errorage //Use the is_plating(), is_plasteel_floor() and is_light_floor() procs instead. --Errorage
name = "floor" name = "floor"
icon = 'floors.dmi' icon = 'floors.dmi'
icon_state = "floor" icon_state = "floor"
@@ -685,7 +686,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
heat_capacity = 10000 heat_capacity = 10000
var/broken = 0 var/broken = 0
var/burnt = 0 var/burnt = 0
var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/steel var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/plasteel
airless airless
icon_state = "floor" icon_state = "floor"
@@ -830,7 +831,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
return return
turf/simulated/floor/proc/update_icon() turf/simulated/floor/proc/update_icon()
if(is_steel_floor()) if(is_plasteel_floor())
if(!broken && !burnt) if(!broken && !burnt)
icon_state = icon_regular_floor icon_state = icon_regular_floor
if(is_plating()) if(is_plating())
@@ -926,8 +927,8 @@ turf/simulated/floor/return_siding_icon_state()
make_plating() make_plating()
break_tile() break_tile()
/turf/simulated/floor/is_steel_floor() /turf/simulated/floor/is_plasteel_floor()
if(istype(floor_tile,/obj/item/stack/tile/steel)) if(istype(floor_tile,/obj/item/stack/tile/plasteel))
return 1 return 1
else else
return 0 return 0
@@ -954,10 +955,10 @@ turf/simulated/floor/return_siding_icon_state()
if(istype(src,/turf/simulated/floor/mech_bay_recharge_floor)) if(istype(src,/turf/simulated/floor/mech_bay_recharge_floor))
src.ReplaceWithPlating() src.ReplaceWithPlating()
if(broken) return if(broken) return
if(is_steel_floor()) if(is_plasteel_floor())
src.icon_state = "damaged[pick(1,2,3,4,5)]" src.icon_state = "damaged[pick(1,2,3,4,5)]"
broken = 1 broken = 1
else if(is_steel_floor()) else if(is_plasteel_floor())
src.icon_state = "light_broken" src.icon_state = "light_broken"
broken = 1 broken = 1
else if(is_plating()) else if(is_plating())
@@ -970,10 +971,10 @@ turf/simulated/floor/return_siding_icon_state()
/turf/simulated/floor/proc/burn_tile() /turf/simulated/floor/proc/burn_tile()
if(istype(src,/turf/simulated/floor/engine)) return if(istype(src,/turf/simulated/floor/engine)) return
if(broken || burnt) return if(broken || burnt) return
if(is_steel_floor()) if(is_plasteel_floor())
src.icon_state = "damaged[pick(1,2,3,4,5)]" src.icon_state = "damaged[pick(1,2,3,4,5)]"
burnt = 1 burnt = 1
else if(is_steel_floor()) else if(is_plasteel_floor())
src.icon_state = "floorscorched[pick(1,2)]" src.icon_state = "floorscorched[pick(1,2)]"
burnt = 1 burnt = 1
else if(is_plating()) else if(is_plating())
@@ -1006,16 +1007,16 @@ turf/simulated/floor/return_siding_icon_state()
update_icon() update_icon()
levelupdate() levelupdate()
//This proc will make the turf a steel floor tile. The expected argument is the tile to make the turf with //This proc will make the turf a plasteel floor tile. The expected argument is the tile to make the turf with
//If none is given it will make a new object. dropping or unequipping must be handled before or after calling //If none is given it will make a new object. dropping or unequipping must be handled before or after calling
//this proc. //this proc.
/turf/simulated/floor/proc/make_steel_floor(var/obj/item/stack/tile/steel/T = null) /turf/simulated/floor/proc/make_plasteel_floor(var/obj/item/stack/tile/plasteel/T = null)
broken = 0 broken = 0
burnt = 0 burnt = 0
intact = 1 intact = 1
sd_SetLuminosity(0) sd_SetLuminosity(0)
if(T) if(T)
if(istype(T,/obj/item/stack/tile/steel)) if(istype(T,/obj/item/stack/tile/plasteel))
floor_tile = T floor_tile = T
if (icon_regular_floor) if (icon_regular_floor)
icon_state = icon_regular_floor icon_state = icon_regular_floor
@@ -1026,7 +1027,7 @@ turf/simulated/floor/return_siding_icon_state()
levelupdate() levelupdate()
return return
//if you gave a valid parameter, it won't get thisf ar. //if you gave a valid parameter, it won't get thisf ar.
floor_tile = new/obj/item/stack/tile/steel floor_tile = new/obj/item/stack/tile/plasteel
icon_state = "floor" icon_state = "floor"
icon_regular_floor = icon_state icon_regular_floor = icon_state
@@ -1220,10 +1221,10 @@ turf/simulated/floor/return_siding_icon_state()
R.use(1) R.use(1)
return return
if (istype(C, /obj/item/stack/tile/steel)) if (istype(C, /obj/item/stack/tile/plasteel))
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
if(L) if(L)
var/obj/item/stack/tile/steel/S = C var/obj/item/stack/tile/plasteel/S = C
del(L) del(L)
playsound(src.loc, 'Genhit.ogg', 50, 1) playsound(src.loc, 'Genhit.ogg', 50, 1)
S.build(src) S.build(src)
@@ -1243,6 +1244,7 @@ turf/simulated/floor/return_siding_icon_state()
inertial_drift(A) inertial_drift(A)
if(ticker && ticker.mode) if(ticker && ticker.mode)
// Okay, so let's make it so that people can travel z levels but not nuke disks! // Okay, so let's make it so that people can travel z levels but not nuke disks!
// if(ticker.mode.name == "nuclear emergency") return // if(ticker.mode.name == "nuclear emergency") return
@@ -1265,6 +1267,8 @@ turf/simulated/floor/return_siding_icon_state()
MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is." MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is."
return return
var/move_to_z_str = pickweight(accessable_z_levels) var/move_to_z_str = pickweight(accessable_z_levels)
var/move_to_z = text2num(move_to_z_str) var/move_to_z = text2num(move_to_z_str)
@@ -1272,8 +1276,11 @@ turf/simulated/floor/return_siding_icon_state()
if(!move_to_z) if(!move_to_z)
return return
A.z = move_to_z A.z = move_to_z
if(src.x <= 2) if(src.x <= 2)
A.x = world.maxx - 2 A.x = world.maxx - 2

14
code/modules/admin/verbs/debug.dm
View File

@@ -612,13 +612,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_r_store) M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_r_store)
M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_l_store) M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_l_store)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack)
if ("pirate") if ("pirate")
M.equip_if_possible(new /obj/item/clothing/under/pirate(M), M.slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/under/pirate(M), M.slot_w_uniform)

2
code/modules/mining/machine_processing.dm
View File

@@ -298,7 +298,7 @@
if (ore_iron > 0 && ore_plasma > 0) if (ore_iron > 0 && ore_plasma > 0)
ore_iron--; ore_iron--;
ore_plasma--; ore_plasma--;
new /obj/item/stack/sheet/r_metal(output.loc) new /obj/item/stack/sheet/plasteel(output.loc)
else else
on = 0 on = 0
continue continue

26
code/modules/mining/machine_stacking.dm
View File

@@ -27,8 +27,8 @@
if(machine.ore_iron) if(machine.ore_iron)
dat += text("Iron: [machine.ore_iron] <A href='?src=\ref[src];release=iron'>Release</A><br>") dat += text("Iron: [machine.ore_iron] <A href='?src=\ref[src];release=iron'>Release</A><br>")
if(machine.ore_steel) if(machine.ore_plasteel)
dat += text("Steel: [machine.ore_steel] <A href='?src=\ref[src];release=steel'>Release</A><br>") dat += text("Plasteel: [machine.ore_plasteel] <A href='?src=\ref[src];release=plasteel'>Release</A><br>")
if(machine.ore_glass) if(machine.ore_glass)
dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>") dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
if(machine.ore_rglass) if(machine.ore_rglass)
@@ -107,12 +107,12 @@
G.amount = machine.ore_iron G.amount = machine.ore_iron
G.loc = machine.output.loc G.loc = machine.output.loc
machine.ore_iron = 0 machine.ore_iron = 0
if ("steel") if ("plasteel")
if (machine.ore_steel > 0) if (machine.ore_plasteel > 0)
var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
G.amount = machine.ore_steel G.amount = machine.ore_plasteel
G.loc = machine.output.loc G.loc = machine.output.loc
machine.ore_steel = 0 machine.ore_plasteel = 0
if ("clown") if ("clown")
if (machine.ore_clown > 0) if (machine.ore_clown > 0)
var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown
@@ -153,7 +153,7 @@
var/ore_clown = 0; var/ore_clown = 0;
var/ore_glass = 0; var/ore_glass = 0;
var/ore_rglass = 0; var/ore_rglass = 0;
var/ore_steel = 0; var/ore_plasteel = 0;
var/ore_adamantine = 0; var/ore_adamantine = 0;
var/stack_amt = 50; //ammount to stack before releassing var/stack_amt = 50; //ammount to stack before releassing
@@ -211,8 +211,8 @@
ore_rglass+= O:amount ore_rglass+= O:amount
del(O) del(O)
continue continue
if (istype(O,/obj/item/stack/sheet/r_metal)) if (istype(O,/obj/item/stack/sheet/plasteel))
ore_steel+= O:amount ore_plasteel+= O:amount
del(O) del(O)
continue continue
if (istype(O,/obj/item/stack/sheet/adamantine)) if (istype(O,/obj/item/stack/sheet/adamantine))
@@ -277,11 +277,11 @@
G.loc = output.loc G.loc = output.loc
ore_rglass -= stack_amt ore_rglass -= stack_amt
return return
if (ore_steel >= stack_amt) if (ore_plasteel >= stack_amt)
var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
G.amount = stack_amt G.amount = stack_amt
G.loc = output.loc G.loc = output.loc
ore_steel -= stack_amt ore_plasteel -= stack_amt
return return
if (ore_adamantine >= stack_amt) if (ore_adamantine >= stack_amt)
var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine

3
code/modules/mob/living/carbon/human/human.dm
View File

@@ -2542,6 +2542,9 @@ It can still be worn/put on as normal.
src.stat = 0 src.stat = 0
return return
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss
if(getFireLoss() > (100 - config.health_threshold_dead) && stat == DEAD) //100 only being used as the magic human max health number, feel free to change it if you add a var for it -- Urist
ChangeToHusk()
return
/mob/living/carbon/human/abiotic(var/full_body = 0) /mob/living/carbon/human/abiotic(var/full_body = 0)
if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask))) if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))

BIN
icons/mob/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 137 KiB

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 53 KiB

14
maps/Antiqua.dmm
View File

@@ -223,7 +223,7 @@
"aeo" = (/obj/machinery/mecha_part_fabricator,/obj/effect/decal/cleanable/oil/streak{icon_state = "floor5"},/obj/effect/decal/cleanable/oil/streak{icon_state = "floor6"},/turf/simulated/floor,/area/assembly/assembly_line) "aeo" = (/obj/machinery/mecha_part_fabricator,/obj/effect/decal/cleanable/oil/streak{icon_state = "floor5"},/obj/effect/decal/cleanable/oil/streak{icon_state = "floor6"},/turf/simulated/floor,/area/assembly/assembly_line)
"aep" = (/obj/structure/stool,/turf/simulated/floor,/area/assembly/assembly_line) "aep" = (/obj/structure/stool,/turf/simulated/floor,/area/assembly/assembly_line)
"aeq" = (/obj/machinery/conveyor_switch{id = "assemblyline1"},/turf/simulated/floor,/area/assembly/assembly_line) "aeq" = (/obj/machinery/conveyor_switch{id = "assemblyline1"},/turf/simulated/floor,/area/assembly/assembly_line)
"aer" = (/obj/structure/table,/obj/item/stack/sheet/r_metal{amount = 20},/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line) "aer" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 20},/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
"aes" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/disposal,/turf/simulated/floor,/area/assembly/assembly_line) "aes" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/disposal,/turf/simulated/floor,/area/assembly/assembly_line)
"aet" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/toxins/hallway) "aet" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/toxins/hallway)
"aeu" = (/obj/machinery/disposal,/turf/simulated/floor,/area/toxins/rdoffice) "aeu" = (/obj/machinery/disposal,/turf/simulated/floor,/area/toxins/rdoffice)
@@ -338,7 +338,7 @@
"agz" = (/obj/effect/sign/vacuum,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "agz" = (/obj/effect/sign/vacuum,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
"agA" = (/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "agA" = (/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
"agB" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "agB" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
"agC" = (/obj/item/stack/tile/steel,/obj/item/stack/tile/steel,/turf/simulated/floor/plating/airless,/area) "agC" = (/obj/item/stack/tile/plasteel,/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating/airless,/area)
"agD" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/assembly/assembly_line) "agD" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/assembly/assembly_line)
"agE" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/multitool,/turf/simulated/floor,/area/assembly/assembly_line) "agE" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/multitool,/turf/simulated/floor,/area/assembly/assembly_line)
"agF" = (/obj/machinery/camera{c_tag = "Robotics Port"; dir = 1; network = "Research"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/assembly/assembly_line) "agF" = (/obj/machinery/camera{c_tag = "Robotics Port"; dir = 1; network = "Research"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -430,7 +430,7 @@
"ain" = (/turf/simulated/wall,/area/security/hos) "ain" = (/turf/simulated/wall,/area/security/hos)
"aio" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "aio" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva)
"aip" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/ai_monitored/storage/eva) "aip" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/external{name = "E.V.A."; req_access_txt = "18"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/ai_monitored/storage/eva)
"aiq" = (/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/r_metal,/turf/simulated/floor/plating/airless,/area) "aiq" = (/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/plasteel,/turf/simulated/floor/plating/airless,/area)
"air" = (/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area) "air" = (/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area)
"ais" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area) "ais" = (/obj/item/stack/rods{amount = 50},/turf/simulated/floor/plating/airless,/area)
"ait" = (/obj/machinery/disposal,/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/assembly/assembly_line) "ait" = (/obj/machinery/disposal,/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/assembly/assembly_line)
@@ -1208,8 +1208,8 @@
"axl" = (/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small) "axl" = (/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/construction/under_construction_small)
"axm" = (/turf/simulated/floor,/area/construction/under_construction_small) "axm" = (/turf/simulated/floor,/area/construction/under_construction_small)
"axn" = (/turf/simulated/floor/plating,/area/construction/under_construction_small) "axn" = (/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axo" = (/obj/item/stack/tile/steel,/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small) "axo" = (/obj/item/stack/tile/plasteel,/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axp" = (/obj/item/stack/tile/steel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small) "axp" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axq" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small) "axq" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking) "axr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking)
"axs" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking) "axs" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/docking)
@@ -1240,7 +1240,7 @@
"axR" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "axR" = (/obj/effect/decal/warning_stripes{tag = "icon-E-corner"; icon_state = "E-corner"},/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
"axS" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor/grid,/area/turret_protected/ai) "axS" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/turf/simulated/floor/grid,/area/turret_protected/ai)
"axT" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/starboard) "axT" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/hallway/primary/starboard)
"axU" = (/obj/item/stack/tile/steel,/turf/simulated/floor/plating,/area/construction/under_construction_small) "axU" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axV" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small) "axV" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor/plating,/area/construction/under_construction_small)
"axW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard) "axW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
"axX" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/docking) "axX" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/docking)
@@ -3140,7 +3140,7 @@
"bit" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage) "bit" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage)
"biu" = (/turf/simulated/floor/plating,/area/engine/construction_storage) "biu" = (/turf/simulated/floor/plating,/area/engine/construction_storage)
"biv" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/construction_storage) "biv" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/construction_storage)
"biw" = (/obj/item/stack/sheet/r_metal,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage) "biw" = (/obj/item/stack/sheet/plasteel,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor/plating,/area/engine/construction_storage)
"bix" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/space,/area) "bix" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/space,/area)
"biy" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area) "biy" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area)
"biz" = (/obj/machinery/power/terminal{dir = 2; icon_state = "term"},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area) "biz" = (/obj/machinery/power/terminal{dir = 2; icon_state = "term"},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area)

4581
maps/backup/Antiqua.dmm Normal file
View File

File diff suppressed because it is too large Load Diff

9811
maps/backup/tgstation.2.0.8.dmm Normal file
View File

File diff suppressed because it is too large Load Diff

2
maps/tgstation.2.0.8.dmm
View File

@@ -5171,7 +5171,7 @@
"bVw" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bVw" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
"bVx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Virology East"; dir = 8; network = "Medbay"},/turf/simulated/floor{icon_state = "white"},/area) "bVx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/camera{c_tag = "Virology East"; dir = 8; network = "Medbay"},/turf/simulated/floor{icon_state = "white"},/area)
"bVy" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line) "bVy" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line)
"bVz" = (/obj/structure/table,/obj/item/stack/sheet/r_metal{amount = 20},/obj/structure/disposalpipe/segment,/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line) "bVz" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 20},/obj/structure/disposalpipe/segment,/obj/item/stack/sheet/glass{amount = 20},/turf/simulated/floor,/area/assembly/assembly_line)
"bVA" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line) "bVA" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)
"bVB" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line) "bVB" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)
"bVC" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/light,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line) "bVC" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/light,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/assembly/assembly_line)