cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces all var/const with #define

Browse Source
This commit is contained in:
AffectedArc07
2020-01-28 21:25:20 +00:00
parent 076ef673cd
commit c64bc93649
269 changed files with 1481 additions and 1474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/anomalies.dm
+1 -1
View File
@@ -124,7 +124,7 @@
..()
var/turf/simulated/T = get_turf(src)
if(istype(T))
T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 3)
T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 3)
/////////////////////
code/game/objects/effects/effect_system/effects_foam.dm
+2 -2
View File
@@ -53,7 +53,7 @@
continue
if(reagents.total_volume)
var/fraction = 5 / reagents.total_volume
reagents.reaction(A, TOUCH, fraction)
reagents.reaction(A, REAGENT_TOUCH, fraction)
return ..()
/obj/effect/particle_effect/foam/process()
@@ -108,7 +108,7 @@
M.reagents.add_reagent(reagent_id, min(round(amount / 2), 15))
if(reagents.total_volume)
var/fraction = 5 / reagents.total_volume
reagents.reaction(M, TOUCH, fraction)
reagents.reaction(M, REAGENT_TOUCH, fraction)
/datum/effect_system/foam_spread
effect_type = /obj/effect/particle_effect/foam
code/game/objects/effects/mines.dm
+3 -3
View File
@@ -78,18 +78,18 @@
/obj/effect/mine/gas
name = "oxygen mine"
var/gas_amount = 360
var/gas_type = SPAWN_OXYGEN
var/gas_type = LINDA_SPAWN_OXYGEN
/obj/effect/mine/gas/mineEffect(mob/living/victim)
atmos_spawn_air(gas_type, gas_amount)
/obj/effect/mine/gas/plasma
name = "plasma mine"
gas_type = SPAWN_HEAT | SPAWN_TOXINS
gas_type = LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS
/obj/effect/mine/gas/n2o
name = "\improper N2O mine"
gas_type = SPAWN_N2O
gas_type = LINDA_SPAWN_N2O
/obj/effect/mine/sound
name = "honkblaster 1000"
code/game/objects/effects/spawners/airlock_spawner.dm
+11 -11
View File
@@ -33,7 +33,7 @@ This spawner places pipe leading up to the interior door, you will need to finis
var/tiles_in_y_direction = 1
var/id_to_link
var/radio_frequency = 1379
var/required_access = list(access_external_airlocks)
var/required_access = list(ACCESS_EXTERNAL_AIRLOCKS)
var/door_name = "external access"
var/door_type = /obj/machinery/door/airlock/external/glass
var/one_door_interior //For square airlocks, if you set this then a) only one door will spawn, and b) you can choose if the door should go opposite to how it normally goes. Please use the define
@@ -285,19 +285,19 @@ This spawner places pipe leading up to the interior door, you will need to finis
required_access = null
/obj/effect/spawner/airlock/engineer
required_access = list(access_engine)
required_access = list(ACCESS_ENGINE)
door_name = "engineering external access"
/obj/effect/spawner/airlock/e_to_w/engineer
required_access = list(access_engine)
required_access = list(ACCESS_ENGINE)
door_name = "engineering external access"
/obj/effect/spawner/airlock/s_to_n/engineer
required_access = list(access_engine)
required_access = list(ACCESS_ENGINE)
door_name = "engineering external access"
/obj/effect/spawner/airlock/long/engineer
required_access = list(access_engine)
required_access = list(ACCESS_ENGINE)
door_name = "engineering external access"
/obj/effect/spawner/airlock/long/square/engine
required_access = list(access_engine)
required_access = list(ACCESS_ENGINE)
door_name = "engine external access"
icon_state = "2x2_N_to_S_leftdoors"
door_type = /obj/machinery/door/airlock/external
@@ -310,17 +310,17 @@ This spawner places pipe leading up to the interior door, you will need to finis
/obj/effect/spawner/airlock/w_to_e/long/square/wide/mining
door_name = "mining external access"
required_access = list(access_mining)
required_access = list(ACCESS_MINING)
/obj/effect/spawner/airlock/long/square/wide/mining
door_name = "mining external access"
required_access = list(access_mining)
required_access = list(ACCESS_MINING)
/obj/effect/spawner/airlock/e_to_w/minisat
door_name = "minisat external access"
required_access = list(access_minisat)
required_access = list(ACCESS_MINISAT)
/obj/effect/spawner/airlock/long/square/e_to_s/telecoms
door_name = "telecoms external access"
required_access = list(access_tcomsat, access_external_airlocks)
required_access = list(ACCESS_TCOMSAT, ACCESS_EXTERNAL_AIRLOCKS)
door_type = /obj/machinery/door/airlock/external
/obj/effect/spawner/airlock/long/square/three/syndicate
@@ -329,7 +329,7 @@ This spawner places pipe leading up to the interior door, you will need to finis
interior_direction = WEST
exterior_direction = NORTH
door_name = "ship external access"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
door_type = /obj/machinery/door/airlock/external
#undef HALF_X
code/game/objects/items/control_wand.dm
+1 -1
View File
@@ -111,7 +111,7 @@
name = "civillian door remote"
icon_state = "gangtool-white"
region_access = list(REGION_GENERAL, REGION_SUPPLY)
additional_access = list(access_hop)
additional_access = list(ACCESS_HOP)
/obj/item/door_remote/centcomm
name = "centcomm door remote"
code/game/objects/items/dehy_carp.dm
+1 -1
View File
@@ -22,7 +22,7 @@
owned = 0
return ..()
/obj/item/toy/carpplushie/dehy_carp/water_act(volume, temperature, source, method = TOUCH)
/obj/item/toy/carpplushie/dehy_carp/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
if(volume >= 1)
Swell()
code/game/objects/items/devices/radio/intercom.dm
+3 -3
View File
@@ -69,7 +69,7 @@
..()
internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(SEC_I_FREQ) = list(access_security)
num2text(SEC_I_FREQ) = list(ACCESS_SECURITY)
)
/obj/item/radio/intercom/syndicate
@@ -81,7 +81,7 @@
/obj/item/radio/intercom/syndicate/New()
..()
internal_channels[num2text(SYND_FREQ)] = list(access_syndicate)
internal_channels[num2text(SYND_FREQ)] = list(ACCESS_SYNDICATE)
/obj/item/radio/intercom/pirate
name = "pirate radio intercom"
@@ -265,4 +265,4 @@
/obj/item/radio/intercom/locked/prison/New()
..()
wires.CutWireIndex(WIRE_TRANSMIT)
wires.CutWireIndex(RADIO_WIRE_TRANSMIT)
code/game/objects/items/devices/radio/radio.dm
+19 -19
View File
@@ -1,22 +1,22 @@
var/global/list/default_internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_captain),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine, access_atmospherics),
num2text(MED_FREQ) = list(access_medical),
num2text(MED_I_FREQ)=list(access_medical),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_research),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_hop, access_bar, access_kitchen, access_hydroponics, access_janitor, access_clown, access_mime)
num2text(AI_FREQ) = list(ACCESS_CAPTAIN),
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
num2text(COMM_FREQ)= list(ACCESS_HEADS),
num2text(ENG_FREQ) = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS),
num2text(MED_FREQ) = list(ACCESS_MEDICAL),
num2text(MED_I_FREQ)=list(ACCESS_MEDICAL),
num2text(SEC_FREQ) = list(ACCESS_SECURITY),
num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
num2text(SCI_FREQ) = list(ACCESS_RESEARCH),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME)
)
var/global/list/default_medbay_channels = list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(access_medical),
num2text(MED_I_FREQ) = list(access_medical)
num2text(MED_FREQ) = list(ACCESS_MEDICAL),
num2text(MED_I_FREQ) = list(ACCESS_MEDICAL)
)
/obj/item/radio
@@ -124,8 +124,8 @@ var/global/list/default_medbay_channels = list(
data["freq"] = format_frequency(frequency)
data["rawfreq"] = num2text(frequency)
data["mic_cut"] = (wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
data["spk_cut"] = (wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
data["mic_cut"] = (wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
data["spk_cut"] = (wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
var/list/chanlist = list_channels(user)
if(islist(chanlist) && chanlist.len)
@@ -181,10 +181,10 @@ var/global/list/default_medbay_channels = list(
return can_admin_interact()
/obj/item/radio/proc/ToggleBroadcast()
broadcasting = !broadcasting && !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
broadcasting = !broadcasting && !(wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
/obj/item/radio/proc/ToggleReception()
listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
listening = !listening && !(wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
/obj/item/radio/Topic(href, href_list)
if(..())
@@ -312,7 +312,7 @@ var/global/list/default_medbay_channels = list(
// Uncommenting this. To the above comment:
// The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom
if(wires.IsIndexCut(WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
if(wires.IsIndexCut(RADIO_WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
return 0
if(!M.IsVocal())
@@ -582,7 +582,7 @@ var/global/list/default_medbay_channels = list(
var/is_listening = TRUE
if(!on)
is_listening = FALSE
if(!wires || wires.IsIndexCut(WIRE_RECEIVE))
if(!wires || wires.IsIndexCut(RADIO_WIRE_RECEIVE))
is_listening = FALSE
if(!listening)
is_listening = FALSE
code/game/objects/items/random_items.dm
+3 -3
View File
@@ -160,7 +160,7 @@
/obj/structure/closet/crate/secure/unknownchemicals
name = "grey-market chemicals grab pack"
desc = "Crate full of chemicals of unknown type and value from a 'trusted' source."
req_one_access = list(access_chemistry,access_research,access_qm) // the qm knows a guy, you see.
req_one_access = list(ACCESS_CHEMISTRY,ACCESS_RESEARCH,ACCESS_QM) // the qm knows a guy, you see.
/obj/structure/closet/crate/secure/unknownchemicals/New()
..()
@@ -178,7 +178,7 @@
/obj/structure/closet/crate/secure/chemicals
name = "chemical supply kit"
desc = "Full of basic chemistry supplies."
req_one_access = list(access_chemistry,access_research)
req_one_access = list(ACCESS_CHEMISTRY,ACCESS_RESEARCH)
/obj/structure/closet/crate/secure/chemicals/New()
..()
@@ -233,7 +233,7 @@
/obj/structure/closet/secure_closet/random_drinks
name = "unlabelled booze closet"
req_access = list(access_bar)
req_access = list(ACCESS_BAR)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
icon_locked = "cabinetdetective_locked"
code/game/objects/items/stacks/sheets/leather.dm
+1 -1
View File
@@ -216,7 +216,7 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
..()
//Step two - washing (also handled by water reagent code and washing machine code)
/obj/item/stack/sheet/hairlesshide/water_act(volume, temperature, source, method = TOUCH)
/obj/item/stack/sheet/hairlesshide/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
if(volume >= 10)
new /obj/item/stack/sheet/wetleather(get_turf(src), amount)
code/game/objects/items/stacks/sheets/mineral.dm
+1 -1
View File
@@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, amount*10)
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, amount*10)
qdel(src)
/obj/item/stack/sheet/mineral/gold
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -1
View File
@@ -36,7 +36,7 @@
if(WT.remove_fuel(0,user))
if(mineralType == "plasma")
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5)
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 5)
user.visible_message("<span class='warning'>[user.name] sets the plasma tiles on fire!</span>", \
"<span class='warning'>You set the plasma tiles on fire!</span>")
message_admins("Plasma tiles ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
code/game/objects/items/weapons/RCD.dm
+1 -1
View File
@@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(access_engine)
req_access = list(ACCESS_ENGINE)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
// Important shit
code/game/objects/items/weapons/cards_ids.dm
+28 -28
View File
@@ -323,7 +323,7 @@
/obj/item/card/id/syndicate
name = "agent card"
var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
var/list/initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS)
origin_tech = "syndicate=1"
var/registered_user = null
untrackable = 1
@@ -338,10 +338,10 @@
/obj/item/card/id/syndicate/vox
name = "agent card"
initial_access = list(access_maint_tunnels, access_vox, access_external_airlocks)
initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_VOX, ACCESS_EXTERNAL_AIRLOCKS)
/obj/item/card/id/syndicate/command
initial_access = list(access_maint_tunnels, access_syndicate, access_syndicate_leader, access_syndicate_command, access_external_airlocks)
initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS)
icon_state = "commander"
/obj/item/card/id/syndicate/afterattack(var/obj/item/O as obj, mob/user as mob, proximity)
@@ -596,7 +596,7 @@
icon_state = "syndie"
assignment = "Syndicate Overlord"
untrackable = 1
access = list(access_syndicate, access_syndicate_leader, access_syndicate_command, access_external_airlocks)
access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS)
/obj/item/card/id/captains_spare
name = "captain's spare ID"
@@ -690,86 +690,86 @@
registered_name = "Captain"
icon_state = "centcom"
desc = "Finders, keepers."
access = list(access_salvage_captain)
access = list(ACCESS_SALVAGE_CAPTAIN)
/obj/item/card/id/medical
name = "Medical ID"
registered_name = "Medic"
icon_state = "medical"
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom)
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/security
name = "Security ID"
registered_name = "Officer"
icon_state = "security"
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons)
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
/obj/item/card/id/research
name = "Research ID"
registered_name = "Scientist"
icon_state = "research"
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_mineral_storeroom)
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/supply
name = "Supply ID"
registered_name = "Cargonian"
icon_state = "cargo"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/engineering
name = "Engineering ID"
registered_name = "Engineer"
icon_state = "engineering"
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
/obj/item/card/id/hos
name = "Head of Security ID"
registered_name = "HoS"
icon_state = "HoS"
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court,
access_forensics_lockers, access_pilot, access_morgue, access_maint_tunnels, access_all_personal_lockers,
access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_weapons)
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
ACCESS_FORENSICS_LOCKERS, ACCESS_PILOT, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS)
/obj/item/card/id/cmo
name = "Chief Medical Officer ID"
registered_name = "CMO"
icon_state = "CMO"
access = list(access_medical, access_morgue, access_genetics, access_heads,
access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
access_keycard_auth, access_sec_doors, access_psychiatrist, access_paramedic, access_mineral_storeroom)
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/rd
name = "Research Director ID"
registered_name = "RD"
icon_state = "RD"
access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_tech_storage, access_teleporter, access_sec_doors,
access_research, access_robotics, access_xenobiology, access_ai_upload,
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_mineral_storeroom)
access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD,
ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/ce
name = "Chief Engineer ID"
registered_name = "CE"
icon_state = "CE"
access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
access_heads, access_construction, access_sec_doors,
access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_minisat, access_mechanic, access_mineral_storeroom)
access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/clown
name = "Pink ID"
registered_name = "HONK!"
icon_state = "clown"
desc = "Even looking at the card strikes you with deep fear."
access = list(access_clown, access_theatre, access_maint_tunnels)
access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
/obj/item/card/id/mime
name = "Black and White ID"
registered_name = "..."
icon_state = "mime"
desc = "..."
access = list(access_mime, access_theatre, access_maint_tunnels)
access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
/obj/item/card/id/rainbow
name = "Rainbow ID"
@@ -811,7 +811,7 @@
name = "Free Golem ID"
desc = "A card used to claim mining points and buy gear. Use it to mark it as yours."
icon_state = "research"
access = list(access_free_golems, access_robotics, access_clown, access_mime) //access to robots/mechs
access = list(ACCESS_FREE_GOLEMS, ACCESS_ROBOTICS, ACCESS_CLOWN, ACCESS_MIME) //access to robots/mechs
var/registered = FALSE
/obj/item/card/id/golem/attack_self(mob/user as mob)
code/game/objects/items/weapons/grenades/atmosgrenade.dm
+3 -3
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "flashbang"
var/spawn_contents = SPAWN_HEAT | SPAWN_TOXINS
var/spawn_contents = LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS
var/spawn_amount = 100
/obj/item/grenade/gas/prime()
@@ -21,13 +21,13 @@
/obj/item/grenade/gas/knockout
name = "knockout grenade"
desc = "A grenade that releases pure N2O gas."
spawn_contents = SPAWN_20C | SPAWN_N2O
spawn_contents = LINDA_SPAWN_20C | LINDA_SPAWN_N2O
/obj/item/grenade/gas/oxygen
name = "oxygen grenade"
desc = "A grenade that releases pure O2 gas."
icon_state = "oxygen"
spawn_contents = SPAWN_20C | SPAWN_OXYGEN
spawn_contents = LINDA_SPAWN_20C | LINDA_SPAWN_OXYGEN
spawn_amount = 500
/obj/item/grenade/gluon
code/game/objects/items/weapons/mop.dm
+1 -1
View File
@@ -30,7 +30,7 @@
for(var/obj/effect/O in A)
if(is_cleanable(O))
qdel(O)
reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
reagents.reaction(A, REAGENT_TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
reagents.remove_any(1) //reaction() doesn't use up the reagents
/obj/item/mop/afterattack(atom/A, mob/user, proximity)
code/game/objects/items/weapons/paint.dm
+1 -1
View File
@@ -23,7 +23,7 @@
if(istype(target) && reagents.total_volume >= 5)
user.visible_message("<span class='warning'>[target] has been splashed with something by [user]!</span>")
spawn(5)
reagents.reaction(target, TOUCH)
reagents.reaction(target, REAGENT_TOUCH)
reagents.remove_any(5)
else
return ..()
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -370,7 +370,7 @@
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
req_access = list(access_virology)
req_access = list(ACCESS_VIROLOGY)
/obj/item/storage/lockbox/vials/New()
..()
code/game/objects/items/weapons/storage/firstaid.dm
+2 -2
View File
@@ -15,7 +15,7 @@
throw_speed = 2
throw_range = 8
var/empty = 0
req_one_access =list(access_medical, access_robotics) //Access and treatment are utilized for medbots.
req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
var/treatment_brute = "salglu_solution"
var/treatment_oxy = "salbutamol"
var/treatment_fire = "salglu_solution"
@@ -189,7 +189,7 @@
treatment_brute = "bicaridine"
treatment_fire = "kelotane"
treatment_tox = "charcoal"
req_one_access =list(access_syndicate)
req_one_access =list(ACCESS_SYNDICATE)
med_bot_skin = "bezerk"
syndicate_aligned = TRUE
code/game/objects/items/weapons/storage/lockbox.dm
+5 -5
View File
@@ -7,7 +7,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
var/locked = 1
var/broken = 0
var/icon_locked = "lockbox+l"
@@ -75,7 +75,7 @@
/obj/item/storage/lockbox/mindshield
name = "Lockbox (Mindshield Implants)"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
/obj/item/storage/lockbox/mindshield/New()
..()
@@ -87,7 +87,7 @@
/obj/item/storage/lockbox/clusterbang
name = "lockbox (clusterbang)"
desc = "You have a bad feeling about opening this."
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
/obj/item/storage/lockbox/clusterbang/New()
..()
@@ -102,7 +102,7 @@
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 20
storage_slots = 12
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_locked = "medalbox+l"
icon_closed = "medalbox"
icon_broken = "medalbox+b"
@@ -117,7 +117,7 @@
/obj/item/storage/lockbox/t4
name = "lockbox (T4)"
desc = "Contains three T4 breaching charges."
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/obj/item/storage/lockbox/t4/New()
..()
code/game/objects/objs.dm
+1 -1
View File
@@ -271,7 +271,7 @@ a {
user.set_machine(src)
onclose(user, "mtcomputer")
/obj/water_act(volume, temperature, source, method = TOUCH)
/obj/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
extinguish()
acid_level = 0
code/game/objects/structures/barsign.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A bar sign with no writing on it"
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
req_access = list(access_bar)
req_access = list(ACCESS_BAR)
max_integrity = 500
integrity_failure = 250
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
@@ -127,7 +127,7 @@
return
set_sign(new /datum/barsign/hiddensigns/syndibarsign)
emagged = 1
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/bar
name = "Booze cabinet"
req_access = list(access_bar)
req_access = list(ACCESS_BAR)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
icon_locked = "cabinetdetective_locked"
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
req_access = list(access_cargo)
req_access = list(ACCESS_CARGO)
icon_state = "securecargo1"
icon_closed = "securecargo"
icon_locked = "securecargo1"
@@ -21,7 +21,7 @@
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(access_qm)
req_access = list(ACCESS_QM)
icon_state = "secureqm1"
icon_closed = "secureqm"
icon_locked = "secureqm1"
code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/chaplain
name = "chapel wardrobe"
desc = "A lockable storage unit for Nanotrasen-approved religious attire."
req_access = list(access_chapel_office)
req_access = list(ACCESS_CHAPEL_OFFICE)
icon_state = "chaplainsecure1"
icon_closed = "chaplainsecure"
icon_locked = "chaplainsecure1"
code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+1 -1
View File
@@ -62,5 +62,5 @@
ignore_use = FALSE
/obj/structure/closet/secure_closet/syndicate/depot/armory
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
is_armory = TRUE
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+5 -5
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(access_ce)
req_access = list(ACCESS_CE)
icon_state = "securece1"
icon_closed = "securece"
icon_locked = "securece1"
@@ -45,7 +45,7 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "secureengelec1"
icon_closed = "secureengelec"
icon_locked = "secureengelec1"
@@ -71,7 +71,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "secureengweld1"
icon_closed = "secureengweld"
icon_locked = "secureengweld1"
@@ -91,7 +91,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "secureeng1"
icon_closed = "secureeng"
icon_locked = "secureeng1"
@@ -120,7 +120,7 @@
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
req_access = list(access_atmospherics)
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "secureatm1"
icon_closed = "secureatm"
icon_locked = "secureatm1"
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+2 -2
View File
@@ -26,7 +26,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
req_access = list(access_kitchen)
req_access = list(ACCESS_KITCHEN)
/obj/structure/closet/secure_closet/freezer/kitchen/New()
..()
@@ -100,7 +100,7 @@
icon_opened = "fridgeopen"
icon_broken = "fridgebroken"
icon_off = "fridge1"
req_access = list(access_heads_vault)
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/guncabinet
name = "gun cabinet"
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
icon = 'icons/obj/guncabinet.dmi'
icon_state = "base"
icon_closed = "base"
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(access_hydroponics)
req_access = list(ACCESS_HYDROPONICS)
icon_state = "hydrosecure1"
icon_closed = "hydrosecure"
icon_locked = "hydrosecure1"
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+11 -11
View File
@@ -7,7 +7,7 @@
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/New()
..()
@@ -35,7 +35,7 @@
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/New()
..()
@@ -49,7 +49,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(access_surgery)
req_access = list(ACCESS_SURGERY)
icon_state = "securemed1"
icon_closed = "securemed"
icon_locked = "securemed1"
@@ -86,7 +86,7 @@
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/exam/New()
..()
@@ -128,7 +128,7 @@
/obj/structure/closet/secure_closet/psychiatrist
name = "psychiatrist's locker"
req_access = list(access_psychiatrist)
req_access = list(ACCESS_PSYCHIATRIST)
icon_state = "securemed1"
icon_closed = "securemed"
icon_locked = "securemed1"
@@ -152,7 +152,7 @@
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(access_cmo)
req_access = list(ACCESS_CMO)
icon_state = "cmosecure1"
icon_closed = "cmosecure"
icon_locked = "cmosecure1"
@@ -199,7 +199,7 @@
/obj/structure/closet/secure_closet/animal
name = "animal control locker"
req_access = list(access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/animal/New()
..()
@@ -218,7 +218,7 @@
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_chemistry)
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/chemical/New()
..()
@@ -240,7 +240,7 @@
anchored = 1
density = 0
wall_mounted = 1
req_access = list(access_medical)
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical_wall/update_icon()
if(broken)
@@ -263,7 +263,7 @@
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medicaloff"
req_access = list(access_paramedic)
req_access = list(ACCESS_PARAMEDIC)
/obj/structure/closet/secure_closet/paramedic/New()
..()
@@ -283,7 +283,7 @@
icon_opened = "medicalopen"
icon_broken = "chemicalbroken"
icon_off = "chemicaloff"
req_access = list(access_chemistry)
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/reagents/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/clown
name = "clown's locker"
req_access = list(access_clown)
req_access = list(ACCESS_CLOWN)
icon_state = "clownsecure1"
icon_closed = "clownsecure"
icon_locked = "clownsecure1"
@@ -26,7 +26,7 @@
/obj/structure/closet/secure_closet/mime
name = "mime's locker"
req_access = list(access_mime)
req_access = list(ACCESS_MIME)
icon_state = "mimesecure1"
icon_closed = "mimesecure"
icon_locked = "mimesecure1"
@@ -50,7 +50,7 @@
/obj/structure/closet/secure_closet/syndicate_officer
name = "officer's locker"
req_access = list(access_syndicate_command)
req_access = list(ACCESS_SYNDICATE_COMMAND)
/obj/structure/closet/secure_closet/syndicate_officer/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/personal
desc = "It's a secure locker for personnel. The first card swiped gains control."
name = "personal closet"
req_access = list(access_all_personal_lockers)
req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
var/registered_name = null
/obj/structure/closet/secure_closet/personal/New()
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+4 -4
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
req_access = list(access_tox_storage)
req_access = list(ACCESS_TOX_STORAGE)
icon_state = "secureres1"
icon_closed = "secureres"
icon_locked = "secureres1"
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/roboticist
name = "roboticist's locker"
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
icon_state = "secureres1"
icon_closed = "secureres"
icon_locked = "secureres1"
@@ -50,7 +50,7 @@
/obj/structure/closet/secure_closet/RD
name = "research director's locker"
req_access = list(access_rd)
req_access = list(ACCESS_RD)
icon_state = "rdsecure1"
icon_closed = "rdsecure"
icon_locked = "rdsecure1"
@@ -88,7 +88,7 @@
icon_opened = "medicalopen"
icon_broken = "rchemicalbroken"
icon_off = "rchemicaloff"
req_access = list(access_tox_storage)
req_access = list(ACCESS_TOX_STORAGE)
/obj/structure/closet/secure_closet/research_reagents/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+15 -15
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/captains
name = "captain's locker"
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_state = "capsecure1"
icon_closed = "capsecure"
icon_locked = "capsecure1"
@@ -38,7 +38,7 @@
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
req_access = list(access_hop)
req_access = list(ACCESS_HOP)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
icon_locked = "hopsecure1"
@@ -64,7 +64,7 @@
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
req_access = list(access_hop)
req_access = list(ACCESS_HOP)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
icon_locked = "hopsecure1"
@@ -91,7 +91,7 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(access_hos)
req_access = list(ACCESS_HOS)
icon_state = "hossecure1"
icon_closed = "hossecure"
icon_locked = "hossecure1"
@@ -132,7 +132,7 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "wardensecure1"
icon_closed = "wardensecure"
icon_locked = "wardensecure1"
@@ -170,7 +170,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_state = "sec1"
icon_closed = "sec"
icon_locked = "sec1"
@@ -201,7 +201,7 @@
/obj/structure/closet/secure_closet/brigdoc
name = "brig physician's locker"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_state = "securemed1"
icon_closed = "securemed"
icon_locked = "securemed1"
@@ -231,7 +231,7 @@
/obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker"
req_access = list(access_blueshield)
req_access = list(ACCESS_BLUESHIELD)
icon_state = "bssecure1"
icon_closed = "bssecure"
icon_locked = "bssecure1"
@@ -265,7 +265,7 @@
/obj/structure/closet/secure_closet/ntrep
name = "\improper Nanotrasen Representative's locker"
req_access = list(access_ntrep)
req_access = list(ACCESS_NTREP)
icon_state = "ntsecure1"
icon_closed = "ntsecure"
icon_locked = "ntsecure1"
@@ -326,7 +326,7 @@
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
req_access = list(access_forensics_lockers)
req_access = list(ACCESS_FORENSICS_LOCKERS)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
icon_locked = "cabinetdetective_locked"
@@ -376,7 +376,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
/obj/structure/closet/secure_closet/injection/New()
..()
@@ -386,7 +386,7 @@
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(access_brig)
req_access = list(ACCESS_BRIG)
anchored = 1
var/id = null
@@ -400,7 +400,7 @@
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(access_court)
req_access = list(ACCESS_COURT)
/obj/structure/closet/secure_closet/courtroom/New()
..()
@@ -416,7 +416,7 @@
/obj/structure/closet/secure_closet/wall
name = "wall locker"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_state = "wall-locker1"
density = 1
icon_closed = "wall-locker"
@@ -442,7 +442,7 @@
/obj/structure/closet/secure_closet/magistrate
name = "\improper Magistrate's locker"
req_access = list(access_magistrate)
req_access = list(ACCESS_MAGISTRATE)
icon_state = "magistratesecure1"
icon_closed = "magistratesecure"
icon_locked = "magistratesecure1"
code/game/objects/structures/displaycase.dm
+3 -3
View File
@@ -222,16 +222,16 @@
/obj/structure/displaycase/captain
alert = TRUE
start_showpiece_type = /obj/item/gun/energy/laser/captain
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
/obj/structure/displaycase/labcage
name = "lab cage"
desc = "A glass lab container for storing interesting creatures."
start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
req_access = list(access_rd)
req_access = list(ACCESS_RD)
/obj/structure/displaycase/stechkin
name = "officer's display case"
desc = "A display case containing a humble stechkin pistol. Never forget your roots."
start_showpiece_type = /obj/item/gun/projectile/automatic/pistol
req_access = list(access_syndicate_command)
req_access = list(ACCESS_SYNDICATE_COMMAND)
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -250,7 +250,7 @@
/obj/structure/falsewall/plasma/proc/burnbabyburn(user)
playsound(src, 'sound/items/welder.ogg', 100, 1)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 400)
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 400)
new /obj/structure/girder/displaced(loc)
qdel(src)
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -202,7 +202,7 @@
TemperatureAct(exposed_temperature)
/obj/structure/mineral_door/transparent/plasma/proc/TemperatureAct(temperature)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500)
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 500)
deconstruct(FALSE)
/obj/structure/mineral_door/transparent/diamond
code/game/objects/structures/morgue.dm
+1 -1
View File
@@ -459,7 +459,7 @@
icon = 'icons/obj/power.dmi'
icon_state = "crema_switch"
anchored = 1.0
req_access = list(access_crematorium)
req_access = list(ACCESS_CREMATORIUM)
var/on = 0
var/area/area = null
var/otherarea = null
code/game/objects/structures/statues.dm
+1 -1
View File
@@ -140,7 +140,7 @@
return ..()
/obj/structure/statue/plasma/proc/PlasmaBurn()
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 160)
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 160)
deconstruct(FALSE)
/obj/structure/statue/plasma/proc/ignite(exposed_temperature)