mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-12 07:35:31 +01:00
@@ -198,4 +198,4 @@ the mob is initialize()d. Switching to a subtype 'live' will require additional
|
||||
effort on the coder.
|
||||
|
||||
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
|
||||
ai_log("flee_from_target() : Stepping away.", AI_LOG_TRACE)
|
||||
step_away(holder, target, vision_range)
|
||||
ai_log("flee_from_target() : Exiting.", AI_LOG_DEBUG)
|
||||
ai_log("flee_from_target() : Exiting.", AI_LOG_DEBUG)
|
||||
|
||||
@@ -65,4 +65,4 @@
|
||||
return FALSE
|
||||
if(get_dist(holder, leader) > follow_distance)
|
||||
return TRUE
|
||||
return FALSE
|
||||
return FALSE
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
return 0
|
||||
|
||||
ai_log("get_path() : Exiting.", AI_LOG_DEBUG)
|
||||
return path.len
|
||||
return path.len
|
||||
|
||||
@@ -99,4 +99,4 @@
|
||||
// Apply movement delay.
|
||||
// Player movement has more factors but its all in the client and fixing that would be its own project.
|
||||
setMoveCooldown(delay_will_be)
|
||||
return
|
||||
return
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
..()
|
||||
var/atom/source = length(alarm.sources_assoc) ? alarm.sources_assoc[1] : alarm.alarm_area()
|
||||
broadcast_engineering_hud_message("Alarm in [alarm.origin] [was_raised ? "raised!" : "cleared."]", source)*/
|
||||
//VOREStation Add End
|
||||
//VOREStation Add End
|
||||
|
||||
@@ -37,4 +37,4 @@
|
||||
add_fingerprint(user)
|
||||
|
||||
/obj/item/assembly/igniter/is_hot()
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
@@ -24,6 +24,6 @@
|
||||
};
|
||||
xhr.send(null);
|
||||
</script>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
if(overmind)
|
||||
name = "[base_name] [overmind.blob_type.name]"
|
||||
else
|
||||
name = "inert [base_name] blob"
|
||||
name = "inert [base_name] blob"
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
return
|
||||
|
||||
for(var/mob/living/L in view(2, T))
|
||||
L.add_modifier(/datum/modifier/faraday, 30 SECONDS)
|
||||
L.add_modifier(/datum/modifier/faraday, 30 SECONDS)
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
return
|
||||
|
||||
for(var/mob/living/L in view(1, T))
|
||||
L.add_modifier(/datum/modifier/blastshield, 30 SECONDS)
|
||||
L.add_modifier(/datum/modifier/blastshield, 30 SECONDS)
|
||||
|
||||
@@ -24,4 +24,4 @@
|
||||
SSradiation.radiate(B, 200)
|
||||
|
||||
/datum/blob_type/radioactive_ooze/on_chunk_tick(obj/item/blobcore_chunk/B)
|
||||
SSradiation.radiate(B, rand(25,100))
|
||||
SSradiation.radiate(B, rand(25,100))
|
||||
|
||||
@@ -37,4 +37,4 @@
|
||||
|
||||
/datum/blob_type/shifting_fragments/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user)
|
||||
user.add_modifier(/datum/modifier/sprinting, 2 MINUTES)
|
||||
return
|
||||
return
|
||||
|
||||
@@ -45,4 +45,4 @@
|
||||
name = "deck of casino cards"
|
||||
desc = "A deck of playing cards from the golden goose casino, comes without a joker card!"
|
||||
icon = 'icons/obj/playing_cards.dmi'
|
||||
icon_state = "casino_deck"
|
||||
icon_state = "casino_deck"
|
||||
|
||||
@@ -66,4 +66,4 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/berry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/greentea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decaf
|
||||
)
|
||||
)
|
||||
|
||||
@@ -65,4 +65,4 @@
|
||||
|
||||
/obj/item/cataloguer/proc/color_box(list/box_segments, new_color, new_time)
|
||||
for(var/i in box_segments)
|
||||
animate(i, color = new_color, time = new_time)
|
||||
animate(i, color = new_color, time = new_time)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/datum/gear/ears/circuitry
|
||||
display_name = "earwear, circuitry (empty)"
|
||||
path = /obj/item/clothing/ears/circuitry
|
||||
|
||||
|
||||
|
||||
/datum/gear/ears/earrings
|
||||
display_name = "earring selection"
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
cmd_admin_mute(src.mob, mute_type, 1)
|
||||
else
|
||||
spam_alert = max(0, spam_alert--)
|
||||
last_message_time = world.time
|
||||
last_message_time = world.time
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
icon_override = 'icons/inventory/accessory/mob_vr.dmi'
|
||||
icon_state = "mod_coat"
|
||||
item_state = "mod_coat"
|
||||
overlay_state = "mod_coat"
|
||||
overlay_state = "mod_coat"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
can_hold = list(
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/melee/classic_baton,
|
||||
/obj/item/melee/telebaton
|
||||
/obj/item/melee/telebaton
|
||||
)
|
||||
|
||||
/obj/item/clothing/accessory/holster/machete/rapier
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
/obj/item/clothing/accessory/permit/drone
|
||||
name = "drone identification card"
|
||||
desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law."
|
||||
icon_state = "permit-drone"
|
||||
icon_state = "permit-drone"
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
name = "bluespace badge"
|
||||
desc = "A small, shielded device capable of holding a number of items in it. Used for carrying items discreetly."
|
||||
icon_state = "solbadge"
|
||||
item_state = "badge"
|
||||
item_state = "badge"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
desc = "Made of some exotic metal, and crafted by space elves. Elves have delicate hands."
|
||||
icon_state = "ge_gloves"
|
||||
icon = 'icons/inventory/hands/item_vr.dmi'
|
||||
icon = 'icons/inventory/hands/mob_vr.dmi'
|
||||
icon = 'icons/inventory/hands/mob_vr.dmi'
|
||||
|
||||
@@ -5,4 +5,3 @@
|
||||
icon = 'icons/inventory/head/item_vr.dmi'
|
||||
icon_override = 'icons/inventory/head/mob_vr.dmi'
|
||||
flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/clothing/head/cone
|
||||
sprite_sheets = list(
|
||||
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
|
||||
)
|
||||
)
|
||||
|
||||
@@ -389,4 +389,4 @@
|
||||
desc = "An SCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety."
|
||||
icon_state = "beret_navy_fifth"
|
||||
*
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
name = "ring gag"
|
||||
desc = "What's that? You'll have to speak more clearly."
|
||||
icon_state = "ringgag"
|
||||
gas_transfer_coefficient = 1
|
||||
gas_transfer_coefficient = 1
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
desc = "A pair of high-heeled boots with hooves on the front of the soles, for use with a hobby horse or to disguise your footprints."
|
||||
icon_state = "hoofboots"
|
||||
icon = 'icons/inventory/feet/item_vr.dmi'
|
||||
icon_override = 'icons/inventory/feet/mob_vr.dmi'
|
||||
icon_override = 'icons/inventory/feet/mob_vr.dmi'
|
||||
|
||||
@@ -155,4 +155,4 @@
|
||||
|
||||
/obj/item/clothing/shoes/hitops/yellow
|
||||
name = "yellow high-tops"
|
||||
icon_state = "yellowhi"
|
||||
icon_state = "yellowhi"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
desc = "Good for Roman around."
|
||||
icon_state = "ge_boots"
|
||||
icon = 'icons/inventory/feet/item_vr.dmi'
|
||||
icon_override = 'icons/inventory/feet/mob_vr.dmi'
|
||||
icon_override = 'icons/inventory/feet/mob_vr.dmi'
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
icon_state = "teshwrap"
|
||||
item_state = "teshwrap"
|
||||
shoes_under_pants = 1 //these are thin and wrapped around the leg, clothing would go over it
|
||||
species_restricted = list(SPECIES_TESHARI)
|
||||
species_restricted = list(SPECIES_TESHARI)
|
||||
|
||||
@@ -27,4 +27,4 @@
|
||||
return
|
||||
|
||||
var/mob/living/M = holder.wearer
|
||||
M.digitalcamo = max(0,(M.digitalcamo-1))
|
||||
M.digitalcamo = max(0,(M.digitalcamo-1))
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
var/obj/item/rig/rig = holder
|
||||
if(rig.open)
|
||||
return TRUE
|
||||
return FALSE
|
||||
return FALSE
|
||||
|
||||
@@ -100,4 +100,4 @@
|
||||
/obj/item/rig_module/device/plasmacutter,
|
||||
/obj/item/rig_module/device/rcd,
|
||||
/obj/item/rig_module/datajack
|
||||
)
|
||||
)
|
||||
|
||||
@@ -43,4 +43,4 @@
|
||||
initial_modules = list(
|
||||
/obj/item/rig_module/ai_container,
|
||||
/obj/item/rig_module/electrowarfare_suite, //might as well
|
||||
)
|
||||
)
|
||||
|
||||
@@ -136,4 +136,4 @@
|
||||
/obj/item/rig_module/ai_container,
|
||||
/obj/item/rig_module/maneuvering_jets,
|
||||
/obj/item/rig_module/mounted/egun,
|
||||
)
|
||||
)
|
||||
|
||||
@@ -311,4 +311,4 @@
|
||||
/obj/item/rig_module/maneuvering_jets,
|
||||
/obj/item/rig_module/grenade_launcher,
|
||||
/obj/item/rig_module/mounted/taser
|
||||
)
|
||||
)
|
||||
|
||||
@@ -134,4 +134,4 @@
|
||||
/obj/item/clothing/suit/space/syndicate/black/engie
|
||||
name = "black engineering space suit"
|
||||
desc = "A black spacesuit sporting red and yellow stripes and durable plating. Robust, reliable, and slightly suspicious."
|
||||
icon_state = "syndicate-black-engie"
|
||||
icon_state = "syndicate-black-engie"
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
|
||||
//Officer Crewsuit (GOLD, X)
|
||||
//The best of the bunch - at the time, this would have been almost cutting edge
|
||||
//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get
|
||||
//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/officer
|
||||
name = "vintage officer's voidsuit helmet"
|
||||
desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This variant appears to be an officer's, and has the best protection of all the old models."
|
||||
@@ -214,7 +214,7 @@
|
||||
/obj/item/gps,
|
||||
/obj/item/radio/beacon,
|
||||
)
|
||||
|
||||
|
||||
//Scientist Crewsuit (PURPLE, O)
|
||||
//Baseline values are slightly worse than the gray crewsuit, but it has significantly better Energy protection and is the only other suit with 100% rad immunity besides the engi suit
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/research
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50)
|
||||
|
||||
/obj/item/clothing/suit/space/void/merc/fire
|
||||
armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50)
|
||||
armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/obj/item/clothing/suit/storage/cargo
|
||||
name = "cargo jacket"
|
||||
desc = "A jacket typically assigned to cargo technicians when it's chilly in cargonia."
|
||||
|
||||
|
||||
icon = 'icons/inventory/suit/item_vr.dmi'
|
||||
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
|
||||
icon_state = "cargo_jacket"
|
||||
@@ -11,7 +11,7 @@
|
||||
/obj/item/clothing/suit/storage/qm
|
||||
name = "\improper QM coat"
|
||||
desc = "A coat typically assigned to quartermasters when it's chilly in cargonia."
|
||||
|
||||
|
||||
icon = 'icons/inventory/suit/item_vr.dmi'
|
||||
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
|
||||
icon_state = "qm_coat"
|
||||
@@ -20,7 +20,7 @@
|
||||
/obj/item/clothing/suit/storage/hazardvest/atmos
|
||||
name = "light blue hazard vest"
|
||||
desc = "A high-visibility vest used in work zones. This one is in the colors of atmospherics!"
|
||||
|
||||
|
||||
icon = 'icons/inventory/suit/item_vr.dmi'
|
||||
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
|
||||
icon_state = "hazard_a"
|
||||
|
||||
@@ -62,4 +62,4 @@
|
||||
|
||||
icon = 'icons/inventory/suit/item_vr.dmi'
|
||||
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
|
||||
icon_state = "labcoat_old_cmo"
|
||||
icon_state = "labcoat_old_cmo"
|
||||
|
||||
@@ -29,5 +29,3 @@
|
||||
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
|
||||
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi'
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
||||
icon_state = "crimson"
|
||||
item_state = "crimson"
|
||||
item_state = "crimson"
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
|
||||
name = "roboticist's jumpsuit"
|
||||
icon_state = "robotics"
|
||||
rolled_sleeves = 0
|
||||
rolled_sleeves = 0
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
icon_state = "webvest"
|
||||
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
|
||||
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
|
||||
slowdown = 0.5
|
||||
slowdown = 0.5
|
||||
|
||||
@@ -214,4 +214,4 @@
|
||||
/obj/item/clothing/under/pants/utility/red
|
||||
name = "red utility pants"
|
||||
desc = "A pair of pleather reinforced red work pants."
|
||||
icon_state = "workpants_red"
|
||||
icon_state = "workpants_red"
|
||||
|
||||
@@ -73,4 +73,4 @@
|
||||
desc = "Traditionally made sandals made with local materials."
|
||||
icon_state = "tribal_sandals"
|
||||
species_restricted = null
|
||||
body_parts_covered = 0
|
||||
body_parts_covered = 0
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#define COMPASS_LABEL_OFFSET 150
|
||||
|
||||
/*
|
||||
This folder contains an abstract type (/obj/compass_holder) which contains a set of
|
||||
waypoints (/datum/compass_waypoint) and generates a circular compass with markers for
|
||||
This folder contains an abstract type (/obj/compass_holder) which contains a set of
|
||||
waypoints (/datum/compass_waypoint) and generates a circular compass with markers for
|
||||
mobs that have the object in their screen list. See GPS for an example implementation.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#undef COMPASS_INTERVAL
|
||||
#undef COMPASS_PERIOD
|
||||
#undef COMPASS_LABEL_OFFSET
|
||||
#undef COMPASS_LABEL_OFFSET
|
||||
|
||||
@@ -15,4 +15,4 @@
|
||||
new /obj/item/reagent_containers/spray/luminol(src)
|
||||
new /obj/item/uv_light(src)
|
||||
new /obj/item/forensics/sample_kit(src)
|
||||
new /obj/item/forensics/sample_kit/powder(src)
|
||||
new /obj/item/forensics/sample_kit/powder(src)
|
||||
|
||||
@@ -33,4 +33,4 @@
|
||||
/obj/item/storage/box/fingerprints/New()
|
||||
..()
|
||||
for(var/i = 1 to storage_slots)
|
||||
new /obj/item/sample/print(src)
|
||||
new /obj/item/sample/print(src)
|
||||
|
||||
@@ -19,17 +19,17 @@
|
||||
),
|
||||
MALE = list(
|
||||
'sound/effects/mob_effects/m_machine_cougha.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughc.ogg'
|
||||
),
|
||||
NEUTER = list(
|
||||
'sound/effects/mob_effects/m_machine_cougha.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughc.ogg'
|
||||
),
|
||||
PLURAL = list(
|
||||
'sound/effects/mob_effects/m_machine_cougha.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughb.ogg',
|
||||
'sound/effects/mob_effects/m_machine_coughc.ogg'
|
||||
)
|
||||
)
|
||||
@@ -40,7 +40,7 @@
|
||||
if(H.get_gender() == FEMALE)
|
||||
if(length(H.species.female_cough_sounds))
|
||||
return list(
|
||||
"sound" = H.species.female_cough_sounds,
|
||||
"sound" = H.species.female_cough_sounds,
|
||||
"vol" = emote_volume
|
||||
)
|
||||
else
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
return list(
|
||||
"sound" = H.species.male_scream_sound,
|
||||
"vol" = emote_volume
|
||||
)
|
||||
)
|
||||
|
||||
@@ -145,5 +145,3 @@
|
||||
if(!AA)
|
||||
return
|
||||
AA.hide(hideFrom)
|
||||
|
||||
|
||||
|
||||
@@ -115,4 +115,4 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
|
||||
else
|
||||
e.desc = " [extra_info]\n\n" + e.desc
|
||||
|
||||
world.Error(e, e_src)
|
||||
world.Error(e, e_src)
|
||||
|
||||
@@ -28,4 +28,4 @@
|
||||
if(!land_target)
|
||||
kill()
|
||||
|
||||
new /datum/random_map/droppod/supply(null, land_target.x-2, land_target.y-2, land_target.z, supplied_drops = list(/obj/structure/ghost_pod/manual/lost_drone/dogborg))
|
||||
new /datum/random_map/droppod/supply(null, land_target.x-2, land_target.y-2, land_target.z, supplied_drops = list(/obj/structure/ghost_pod/manual/lost_drone/dogborg))
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
|
||||
// Overmap version
|
||||
/datum/event/dust/overmap/announce()
|
||||
return
|
||||
return
|
||||
|
||||
@@ -74,4 +74,4 @@
|
||||
|
||||
// Overmap version
|
||||
/datum/event/electrical_storm/overmap/announce()
|
||||
return
|
||||
return
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
engine.power_spike(80)
|
||||
break // Just one engine, please.
|
||||
// After that, the engine checks if a grid checker exists on the same powernet, and if so, it triggers a blackout.
|
||||
// If not, lots of stuff breaks. See code/modules/power/generator.dm for that piece of code.
|
||||
// If not, lots of stuff breaks. See code/modules/power/generator.dm for that piece of code.
|
||||
|
||||
@@ -19,4 +19,4 @@
|
||||
kill() // To prevent fake announcements
|
||||
return
|
||||
|
||||
new /obj/structure/ghost_pod/ghost_activated/morphspawn(get_turf(spawnspot))
|
||||
new /obj/structure/ghost_pod/ghost_activated/morphspawn(get_turf(spawnspot))
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
O.ordernum = SSsupply.ordernum
|
||||
O.object = SSsupply.supply_pack[pick(SSsupply.supply_pack)]
|
||||
O.ordered_by = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
|
||||
SSsupply.shoppinglist += O
|
||||
SSsupply.shoppinglist += O
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
if(!(neighbor in frontier_set) && !(neighbor in explored_set))
|
||||
frontier_set += neighbor
|
||||
return result_set
|
||||
|
||||
|
||||
|
||||
|
||||
/datum/event/window_break/start()
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/get_description_interaction()
|
||||
description_info = "To ring an airlock's doorbell, hold Alt and click on the airlock with the Left Mouse Button on Green/Help intent. Doing the same on Harm intent will instead hammer on the airlock." //vorestation edit
|
||||
|
||||
|
||||
var/list/results = list()
|
||||
|
||||
if(can_remove_electronics())
|
||||
|
||||
@@ -88,4 +88,4 @@
|
||||
if(reach > 1)
|
||||
weapon_stats += "\nIt can attack targets up to [reach] tiles away, and can attack over certain objects."
|
||||
|
||||
return weapon_stats
|
||||
return weapon_stats
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
/obj/machinery/porta_turret/ai_defense
|
||||
description_info = "This is a variant of the normal turret, utilizing an internal energy weapon. This version can fire stun \
|
||||
beams, or an xray laser, which is much harder for solid objects to stop than normal laser light, and can be configured remotely \
|
||||
with a turret control switch. This variant is also much more durable, and is hardened against electromagnetic pulses."
|
||||
with a turret control switch. This variant is also much more durable, and is hardened against electromagnetic pulses."
|
||||
|
||||
@@ -21,4 +21,4 @@
|
||||
You can replenish your supply of metal as a synthetic by recharging."
|
||||
|
||||
/obj/item/stack/material
|
||||
description_info = "Use in your hand to bring up the recipe menu. If you have enough sheets, click on something on the list to build it."
|
||||
description_info = "Use in your hand to bring up the recipe menu. If you have enough sheets, click on something on the list to build it."
|
||||
|
||||
@@ -28,4 +28,3 @@
|
||||
var/command = config.python_path + " " + script + " " + args
|
||||
return shell(command)
|
||||
*/
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2)
|
||||
req_components = list (
|
||||
/obj/item/stock_parts/micro_laser = 2
|
||||
)
|
||||
)
|
||||
|
||||
@@ -83,4 +83,4 @@ GLOBAL_LIST_INIT(ocean_fishing_common_list, list(
|
||||
#undef FISHING_UNCOMMON
|
||||
#undef FISHING_COMMON
|
||||
#undef FISHING_JUNK
|
||||
#undef FISHING_NOTHING
|
||||
#undef FISHING_NOTHING
|
||||
|
||||
@@ -17,4 +17,3 @@
|
||||
volume = 120
|
||||
possible_transfer_amounts = list(5,15,30)
|
||||
matter = list(MAT_PLASTIC = 50)
|
||||
|
||||
@@ -68,4 +68,4 @@
|
||||
|
||||
WL.wetness = max(0, WL.wetness - rand(1, 3))
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
|
||||
if(istype(O, /obj/item/slime_extract) || istype(O, /obj/item/slimepotion))
|
||||
return 1
|
||||
return 0
|
||||
return 0
|
||||
|
||||
@@ -38,4 +38,4 @@
|
||||
/datum/event2/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
|
||||
// Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
|
||||
var/turf/T = get_turf(C)
|
||||
return T && C?.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
|
||||
return T && C?.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
|
||||
|
||||
@@ -23,4 +23,3 @@
|
||||
log_debug("canister_leak event: Canister [C] ([C.x],[C.y],[C.z]) destroyed.")
|
||||
C.health = 0
|
||||
C.healthcheck()
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
/datum/gm_action/carp_migration/announce()
|
||||
var/announcement = "Unknown biological entities have been detected near the asteroid, please stand-by."
|
||||
command_announcement.Announce(announcement, "Lifesign Alert")
|
||||
command_announcement.Announce(announcement, "Lifesign Alert")
|
||||
|
||||
@@ -41,6 +41,3 @@
|
||||
rot_count++
|
||||
if(rot_count >= target_rot)
|
||||
break
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -96,4 +96,3 @@
|
||||
// log_debug("ELECTRICAL EVENT: Emagged \the [A].")
|
||||
playsound(A, 'sound/machines/chime.ogg', 50, 1)
|
||||
apcs_emagged++
|
||||
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
if(A.z in get_location_z_levels(space_only = TRUE))
|
||||
A.gravitychange(TRUE)
|
||||
|
||||
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
|
||||
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
/datum/event2/event/gravity/end()
|
||||
gravity_is_on = 1
|
||||
|
||||
|
||||
var/did_anything = FALSE
|
||||
for(var/obj/machinery/gravity_generator/main/GG in generators)
|
||||
if(!GG.on)
|
||||
@@ -42,4 +42,4 @@
|
||||
did_anything = TRUE
|
||||
|
||||
if(did_anything)
|
||||
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
|
||||
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
|
||||
|
||||
@@ -18,4 +18,4 @@
|
||||
post_pod_creation(pod)
|
||||
|
||||
// Override to do things to the pod after it's spawned.
|
||||
/datum/event2/event/ghost_pod_spawner/proc/post_pod_creation(obj/structure/ghost_pod/pod)
|
||||
/datum/event2/event/ghost_pod_spawner/proc/post_pod_creation(obj/structure/ghost_pod/pod)
|
||||
|
||||
@@ -60,4 +60,4 @@
|
||||
|
||||
/datum/event2/event/legacy/gravity
|
||||
legacy_event = /datum/event/gravity
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -78,4 +78,4 @@
|
||||
enabled = !enabled
|
||||
message_admins("Event '[name]' was toggled [enabled ? "on" : "off"] by [usr.key].")
|
||||
|
||||
// SSgame_master.interact(usr) // To refresh the UI. // VOREStation Edit - We don't use SSgame_master yet.
|
||||
// SSgame_master.interact(usr) // To refresh the UI. // VOREStation Edit - We don't use SSgame_master yet.
|
||||
|
||||
@@ -29,4 +29,4 @@
|
||||
P = new()
|
||||
P.name = "Blank Card"
|
||||
P.card_icon = "[icon_state]_card_back"
|
||||
P.back_icon = "[icon_state]_card_back"
|
||||
P.back_icon = "[icon_state]_card_back"
|
||||
|
||||
@@ -44,4 +44,3 @@
|
||||
P.card_icon = "[colour]_[number]"
|
||||
P.back_icon = "deck1"
|
||||
cards += P
|
||||
|
||||
|
||||
@@ -100,4 +100,4 @@
|
||||
</body>
|
||||
</html>
|
||||
|
||||
"}
|
||||
"}
|
||||
|
||||
@@ -77,4 +77,4 @@
|
||||
/area/proc/holomapAlwaysDraw()
|
||||
return TRUE
|
||||
/area/shuttle/holomapAlwaysDraw()
|
||||
return FALSE
|
||||
return FALSE
|
||||
|
||||
@@ -240,4 +240,3 @@
|
||||
for(var/turf/t in view(5))
|
||||
var/obj/s = new /obj/square(t)
|
||||
s.icon = generate_bluespace_icon(s.icon, s.icon_state)
|
||||
|
||||
|
||||
@@ -91,6 +91,3 @@
|
||||
out.Insert(I, "", 2, frame_num++, 0, frame[2])
|
||||
|
||||
return out
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
/obj/structure/musician/attack_hand(mob/M)
|
||||
if(!M.IsAdvancedToolUser())
|
||||
return
|
||||
|
||||
|
||||
interact(M)
|
||||
|
||||
/obj/structure/musician/proc/should_stop_playing(mob/user)
|
||||
|
||||
@@ -15,4 +15,4 @@
|
||||
|
||||
/obj/item/electronic_assembly/implant/update_icon()
|
||||
..()
|
||||
implant.icon_state = icon_state
|
||||
implant.icon_state = icon_state
|
||||
|
||||
@@ -22,4 +22,4 @@
|
||||
/datum/integrated_io/boolean/display_data(var/input)
|
||||
if(data == TRUE)
|
||||
return "(True)"
|
||||
return "(False)"
|
||||
return "(False)"
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
outputs = list()
|
||||
activators = list()
|
||||
power_draw_idle = 0
|
||||
power_draw_per_use = 0
|
||||
power_draw_per_use = 0
|
||||
|
||||
@@ -311,4 +311,3 @@
|
||||
set_pin_data(IC_OUTPUT, 1, result)
|
||||
push_data()
|
||||
activate_pin(2)
|
||||
|
||||
|
||||
@@ -36,4 +36,4 @@
|
||||
activators = list("on activation" = IC_PINTYPE_PULSE_OUT)
|
||||
|
||||
/obj/item/integrated_circuit/built_in/action_button/do_work()
|
||||
activate_pin(1)
|
||||
activate_pin(1)
|
||||
|
||||
@@ -74,16 +74,16 @@
|
||||
var/ascii = text2ascii(input, i)
|
||||
if(ascii >= 65 && ascii <= 90)
|
||||
ascii += rotation
|
||||
if(ascii > 90)
|
||||
if(ascii > 90)
|
||||
ascii -= 26
|
||||
|
||||
else if(ascii >= 97 && ascii <= 122)
|
||||
ascii += rotation
|
||||
if(ascii > 122)
|
||||
if(ascii > 122)
|
||||
ascii -= 26
|
||||
|
||||
result += ascii2text(ascii)
|
||||
|
||||
set_pin_data(IC_OUTPUT, 1, result)
|
||||
push_data()
|
||||
activate_pin(2)
|
||||
activate_pin(2)
|
||||
|
||||
@@ -143,4 +143,4 @@
|
||||
name = "sixteen pulse demultiplexer"
|
||||
icon_state = "dmux16"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
number_of_outputs = 16
|
||||
number_of_outputs = 16
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
|
||||
set_pin_data(IC_OUTPUT, 1, desired_dir)
|
||||
push_data()
|
||||
activate_pin(2)
|
||||
activate_pin(2)
|
||||
|
||||
@@ -137,4 +137,4 @@
|
||||
|
||||
set_pin_data(IC_OUTPUT, 1, result)
|
||||
push_data()
|
||||
activate_pin(2)
|
||||
activate_pin(2)
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
#undef IC_PINTYPE_PULSE_IN
|
||||
#undef IC_PINTYPE_PULSE_OUT
|
||||
|
||||
#undef IC_MAX_LIST_LENGTH
|
||||
#undef IC_MAX_LIST_LENGTH
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user