mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] end of file Fix (#10355)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2af001e7e5
commit
65f21fb1d3
@@ -1,3 +1,3 @@
|
||||
/obj/machinery/atmospherics/binary/passive_gate/on
|
||||
unlocked = 1
|
||||
icon_state = "on"
|
||||
icon_state = "on"
|
||||
|
||||
@@ -18,4 +18,4 @@
|
||||
if(!powered())
|
||||
icon_state = "off"
|
||||
else
|
||||
icon_state = "[use_power ? "on" : "off"]"
|
||||
icon_state = "[use_power ? "on" : "off"]"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
cut_overlays()
|
||||
add_overlay(icon_manager.get_atmos_icon("pipe", , pipe_color, "cap[icon_connect_type]"))
|
||||
|
||||
|
||||
/obj/machinery/atmospherics/pipe/cap/atmos_init()
|
||||
for(var/obj/machinery/atmospherics/target in get_step(src, dir))
|
||||
if (can_be_node(target, 1))
|
||||
@@ -156,4 +156,4 @@
|
||||
piping_layer = PIPING_LAYER_AUX
|
||||
layer = PIPES_AUX_LAYER
|
||||
icon_connect_type = "-aux"
|
||||
color = PIPE_COLOR_CYAN
|
||||
color = PIPE_COLOR_CYAN
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/set_leaking(var/new_leaking)
|
||||
return //Nope
|
||||
return //Nope
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/obj/machinery/atmospherics/pipe/set_leaking(var/new_leaking)
|
||||
return // N O P E
|
||||
return // N O P E
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
start_pressure = 15000
|
||||
|
||||
/obj/machinery/atmospherics/pipe/tank/air/full
|
||||
start_pressure = 15000
|
||||
start_pressure = 15000
|
||||
|
||||
@@ -17,4 +17,4 @@ var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
|
||||
dbg_img = img
|
||||
|
||||
/proc/soft_assert(thing,fail)
|
||||
if(!thing) message_admins(fail)
|
||||
if(!thing) message_admins(fail)
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
}\
|
||||
##Path/CanProcCall(procname){\
|
||||
return FALSE;\
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,4 +25,4 @@
|
||||
#define CAT_ICE "Frozen"
|
||||
#define CAT_DRINK "Drinks"
|
||||
#define CAT_CHEMISTRY "Chemistry"
|
||||
#define CAT_TOOL "Tool"
|
||||
#define CAT_TOOL "Tool"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#define HOSE_INPUT "Input"// Only pull liquid.
|
||||
#define HOSE_OUTPUT "Output"// Only push liquid.
|
||||
#define HOSE_NEUTRAL "Neutral"// Equalize liquids, not super efficient, can waste reagents due to rounding.
|
||||
#define HOSE_NEUTRAL "Neutral"// Equalize liquids, not super efficient, can waste reagents due to rounding.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Methods of obtaining a circuit.
|
||||
#define IC_SPAWN_DEFAULT 1 // If the circuit comes in the default circuit box and able to be printed in the IC printer.
|
||||
#define IC_SPAWN_RESEARCH 2 // If the circuit design will be available in the IC printer after upgrading it.
|
||||
#define IC_SPAWN_ILLEGAL 3 // If the circuit design will be available if upgrading the IC printer illegally.
|
||||
#define IC_SPAWN_ILLEGAL 3 // If the circuit design will be available if upgrading the IC printer illegally.
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
#define SQLITE_FEEDBACK_COLUMN_AUTHOR "author"
|
||||
#define SQLITE_FEEDBACK_COLUMN_TOPIC "topic"
|
||||
#define SQLITE_FEEDBACK_COLUMN_CONTENT "content"
|
||||
#define SQLITE_FEEDBACK_COLUMN_DATETIME "datetime"
|
||||
#define SQLITE_FEEDBACK_COLUMN_DATETIME "datetime"
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
#define SUP_ORDER_REQUESTED "Requested"
|
||||
#define SUP_ORDER_APPROVED "Approved"
|
||||
#define SUP_ORDER_DENIED "Denied"
|
||||
#define SUP_ORDER_SHIPPED "Shipped"
|
||||
#define SUP_ORDER_SHIPPED "Shipped"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define TARGET_CAN_MOVE 1
|
||||
#define TARGET_CAN_RUN 2
|
||||
#define TARGET_CAN_CLICK 4
|
||||
#define TARGET_CAN_RADIO 8
|
||||
#define TARGET_CAN_RADIO 8
|
||||
|
||||
@@ -18,4 +18,4 @@
|
||||
#define TOOL_BONESET "bonesetter"
|
||||
#define TOOL_KNIFE "knife"
|
||||
#define TOOL_BLOODFILTER "bloodfilter"
|
||||
#define TOOL_ROLLINGPIN "rollingpin"
|
||||
#define TOOL_ROLLINGPIN "rollingpin"
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
#define ASCII_RED "[ASCII_ESC]\[31m"
|
||||
#define ASCII_GREEN "[ASCII_ESC]\[32m"
|
||||
#define ASCII_YELLOW "[ASCII_ESC]\[33m"
|
||||
#define ASCII_RESET "[ASCII_ESC]\[0m"
|
||||
#define ASCII_RESET "[ASCII_ESC]\[0m"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
|
||||
//Note: typecache can only replace istype if you know for sure the thing is at least a datum.
|
||||
|
||||
GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack))
|
||||
GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack))
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
|
||||
var/datum/gear_tweak/implant_location/gear_tweak_implant_location = new()
|
||||
var/datum/gear_tweak/implant_location/gear_tweak_implant_location = new()
|
||||
|
||||
@@ -1 +1 @@
|
||||
var/datum/gear_tweak/collar_tag/gear_tweak_collar_tag = new()
|
||||
var/datum/gear_tweak/collar_tag/gear_tweak_collar_tag = new()
|
||||
|
||||
@@ -36,4 +36,4 @@
|
||||
var/area/A = locate(T)
|
||||
if(!istype(A) || !A.contents.len) // Empty contents list means it's not on the map.
|
||||
continue
|
||||
. += A
|
||||
. += A
|
||||
|
||||
@@ -128,4 +128,4 @@
|
||||
|
||||
#undef LUMR
|
||||
#undef LUMG
|
||||
#undef LUMB
|
||||
#undef LUMB
|
||||
|
||||
@@ -11,4 +11,4 @@ GLOBAL_LIST_EMPTY(string_lists)
|
||||
if(.)
|
||||
return
|
||||
|
||||
return GLOB.string_lists[string_id] = values
|
||||
return GLOB.string_lists[string_id] = values
|
||||
|
||||
@@ -40,4 +40,4 @@ GLOBAL_LIST_EMPTY(typelistkeys)
|
||||
|
||||
for (var/saving in savings)
|
||||
to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#define open_link(target, url) target << link(url)
|
||||
|
||||
// From TG, might be useful to have.
|
||||
// Didn't port SEND_TEXT() since to_chat() appears to serve the same purpose.
|
||||
#define DIRECT_OUTPUT(A, B) A << B
|
||||
#define DIRECT_INPUT(A, B) A >> B
|
||||
#define SEND_IMAGE(target, image) DIRECT_OUTPUT(target, image)
|
||||
|
||||
@@ -1 +1 @@
|
||||
#define CLICKCATCHER_PLANE -99
|
||||
#define CLICKCATCHER_PLANE -99
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
/obj/screen/ai/multicam/Click()
|
||||
if(..())
|
||||
return
|
||||
/obj/screen/ai/multicam/Click()
|
||||
if(..())
|
||||
return
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
AI.toggle_multicam()
|
||||
|
||||
/obj/screen/ai/add_multicam/Click()
|
||||
if(..())
|
||||
return
|
||||
AI.toggle_multicam()
|
||||
|
||||
/obj/screen/ai/add_multicam/Click()
|
||||
if(..())
|
||||
return
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
AI.drop_new_multicam()
|
||||
AI.drop_new_multicam()
|
||||
|
||||
/obj/screen/ai/up/Click()
|
||||
var/mob/living/silicon/ai/AI = usr
|
||||
@@ -154,7 +154,7 @@
|
||||
using.layer = SCREEN_LAYER
|
||||
HUD.adding += using
|
||||
|
||||
//Multicamera mode
|
||||
//Multicamera mode
|
||||
using = new /obj/screen/ai/multicam() // special
|
||||
using.name = "Multicamera Mode"
|
||||
using.icon = HUD.ui_style
|
||||
@@ -162,8 +162,8 @@
|
||||
using.screen_loc = ui_ai_multicam
|
||||
using.layer = SCREEN_LAYER
|
||||
HUD.adding += using
|
||||
|
||||
//Add multicamera camera
|
||||
|
||||
//Add multicamera camera
|
||||
using = new /obj/screen/ai/add_multicam() // special
|
||||
using.name = "New Camera"
|
||||
using.icon = HUD.ui_style
|
||||
@@ -188,7 +188,7 @@
|
||||
using.screen_loc = ui_ai_updown
|
||||
using.layer = SCREEN_LAYER
|
||||
HUD.adding += using
|
||||
|
||||
|
||||
if(client && apply_to_client)
|
||||
client.screen = list()
|
||||
client.screen += HUD.adding + HUD.other
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
/obj/screen/alert/starving/synth
|
||||
name = "Low Power"
|
||||
desc = "Your battery is very low! Low power mode makes all movements slower."
|
||||
|
||||
|
||||
/obj/screen/alert/xenochimera/reconstitution
|
||||
name = "Reconstructing Form"
|
||||
desc = "You're still rebuilding your body! Click the alert to find out how long you have left."
|
||||
@@ -38,7 +38,7 @@
|
||||
else if(H.revive_ready == REVIVING_DONE)
|
||||
to_chat(usr, "You should have a notification + alert for this! Bug report that this is still here!")
|
||||
*/
|
||||
|
||||
|
||||
/obj/screen/alert/xenochimera/readytohatch
|
||||
name = "Ready to Hatch"
|
||||
desc = "You're done reconstructing your cells! Click me to Hatch!"
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
/datum/mini_hud/mapper/Destroy()
|
||||
owner?.hud_item = null
|
||||
owner?.hud_datum = null
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/mob/living/silicon/robot/update_hud()
|
||||
if(modtype)
|
||||
hands.icon_state = get_hud_module_icon()
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -33,4 +33,4 @@ SUBSYSTEM_DEF(event_ticker)
|
||||
/datum/controller/subsystem/event_ticker/proc/event_finished(datum/event2/event/E)
|
||||
log_debug("Event [E.type] has finished.")
|
||||
active_events -= E
|
||||
finished_events += E
|
||||
finished_events += E
|
||||
|
||||
@@ -13,4 +13,4 @@ PROCESSING_SUBSYSTEM_DEF(obj)
|
||||
if(!isobj(D))
|
||||
log_debug("[name] subsystem Recover() found inappropriate item in list: [D.type]")
|
||||
if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
|
||||
processing |= D
|
||||
processing |= D
|
||||
|
||||
@@ -127,4 +127,4 @@
|
||||
var/man_rating = 0
|
||||
|
||||
/datum/category_item/autolathe/dd_SortValue()
|
||||
return name
|
||||
return name
|
||||
|
||||
@@ -72,4 +72,4 @@
|
||||
|
||||
/datum/category_item/autolathe/engineering/arf_generator
|
||||
name = "atmospheric field generator electronics"
|
||||
path =/obj/item/circuitboard/arf_generator
|
||||
path =/obj/item/circuitboard/arf_generator
|
||||
|
||||
@@ -9,4 +9,3 @@
|
||||
/datum/category_item/autolathe/general/drinkingglass/pitcher
|
||||
name = "plastic pitcher"
|
||||
path =/obj/item/reagent_containers/food/drinks/glass2/pitcher
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
/datum/category_item/autolathe/medical/autoinjector/biginjector
|
||||
name = "empty large autoinjector"
|
||||
path =/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty
|
||||
resources = list(MAT_PLASTIC = 500)
|
||||
resources = list(MAT_PLASTIC = 500)
|
||||
|
||||
@@ -40,4 +40,4 @@
|
||||
|
||||
/obj/machinery/CheckParts(list/parts_list)
|
||||
..()
|
||||
RefreshParts()
|
||||
RefreshParts()
|
||||
|
||||
@@ -36,4 +36,4 @@
|
||||
list(/obj/item/stack/material/cloth = 3)
|
||||
)
|
||||
time = 60
|
||||
category = CAT_CLOTHING
|
||||
category = CAT_CLOTHING
|
||||
|
||||
@@ -123,4 +123,4 @@
|
||||
result = /obj/item/handcuffs/cable/plantfiber
|
||||
reqs = list(list(/obj/item/stack/material/fiber = 3))
|
||||
time = 60
|
||||
category = CAT_MISC
|
||||
category = CAT_MISC
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
/datum/crafting_recipe/scopedrifle
|
||||
name = "Bolt scope to bolt-action (cannot be removed)"
|
||||
result = /obj/item/gun/projectile/shotgun/pump/rifle/scoped
|
||||
reqs = list(list(/obj/item/binoculars/scope = 1),
|
||||
reqs = list(list(/obj/item/binoculars/scope = 1),
|
||||
list(/obj/item/gun/projectile/shotgun/pump/rifle = 1))
|
||||
time = 180
|
||||
category = CAT_WEAPONRY
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
/datum/game_master/proc/choose_event()
|
||||
|
||||
/datum/game_master/proc/log_game_master(message)
|
||||
// SSgame_master.log_game_master(message) // VOREStation Edit - We don't use SSgame_master yet.
|
||||
// SSgame_master.log_game_master(message) // VOREStation Edit - We don't use SSgame_master yet.
|
||||
|
||||
@@ -57,4 +57,4 @@
|
||||
|
||||
/datum/topic_input/proc/getList(i)
|
||||
var/t = getAndLocate(i)
|
||||
return islist(t) ? t : null
|
||||
return islist(t) ? t : null
|
||||
|
||||
@@ -27,4 +27,4 @@
|
||||
return hierarchy_type == type
|
||||
|
||||
/decl/hierarchy/dd_SortValue()
|
||||
return name
|
||||
return name
|
||||
|
||||
@@ -99,4 +99,4 @@
|
||||
name = "Euthenia"
|
||||
desc = "A superneptune massing at 46 time that of Earth, Euthenia is one of the few planets still commonly called it's original survey designation. \
|
||||
(The surveyor is noted to have a preference for ancient Greek mythology) As an ice giant, Euthenia has had consistent economic stability thanks to \
|
||||
the presence of fuel depots supplied by the giants atmosphere."
|
||||
the presence of fuel depots supplied by the giants atmosphere."
|
||||
|
||||
@@ -39,4 +39,4 @@
|
||||
name = "Uranus"
|
||||
|
||||
/datum/locations/neptune
|
||||
name = "Neptune"
|
||||
name = "Neptune"
|
||||
|
||||
@@ -49,4 +49,4 @@
|
||||
an anomalous network of cavities within the middle and lower crust of the planet that result in remarkably low gravity, and a complete lack of \
|
||||
seismic activity. The planet is completely void of anything making settlement worthwhile, but recently there have been rumours of illegitimate \
|
||||
shipping here. Security patrols have thus far turned up nothing, but some parties hypothesize that any smugglers or bandits could hide in the dense \
|
||||
molecular band in a median orbit around Tau Ceti to fool in-system sensors."
|
||||
molecular band in a median orbit around Tau Ceti to fool in-system sensors."
|
||||
|
||||
@@ -37,4 +37,4 @@
|
||||
|
||||
/datum/locations/yoos
|
||||
name = "Yoos"
|
||||
desc = "A tiny (1/8th the size of Moghes) frozen planet at the very edge of the Uueoa-Esa system of very little note."
|
||||
desc = "A tiny (1/8th the size of Moghes) frozen planet at the very edge of the Uueoa-Esa system of very little note."
|
||||
|
||||
@@ -42,4 +42,4 @@
|
||||
|
||||
/datum/looping_sound/small_motor/get_sound(starttime)
|
||||
speed = clamp(speed, 1, 3)
|
||||
return ..(starttime, mid_sounds[speed])
|
||||
return ..(starttime, mid_sounds[speed])
|
||||
|
||||
@@ -49,4 +49,4 @@ GLOBAL_VAR(managed_browser_id_ticker)
|
||||
/datum/managed_browser/proc/interact(html, title, client/C)
|
||||
var/datum/browser/popup = new(C.mob, browser_id, title, size_x, size_y, src)
|
||||
popup.set_content(html)
|
||||
popup.open()
|
||||
popup.open()
|
||||
|
||||
@@ -59,5 +59,3 @@ var/list/modules = list( // global associative list
|
||||
modcount["[type]"] = num
|
||||
|
||||
return 2**num-1
|
||||
|
||||
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
|
||||
#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
|
||||
#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
|
||||
#define OUTFIT_COSTUME(job_name) ("Costume - " + job_name)
|
||||
#define OUTFIT_COSTUME(job_name) ("Costume - " + job_name)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/decl/hierarchy/outfit/costume
|
||||
undress = 0
|
||||
undress = 0
|
||||
|
||||
@@ -127,4 +127,4 @@
|
||||
shoes = /obj/item/clothing/shoes/brown
|
||||
head = /obj/item/clothing/head/marine
|
||||
suit = /obj/item/clothing/suit/marine
|
||||
r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff
|
||||
r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
id_type = /obj/item/card/id/silver/hop
|
||||
|
||||
/decl/hierarchy/outfit/job/secretary
|
||||
id_type = /obj/item/card/id/silver/secretary
|
||||
id_type = /obj/item/card/id/silver/secretary
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/decl/hierarchy/outfit/job/medical/doctor/virologist
|
||||
id_type = /obj/item/card/id/medical/virologist
|
||||
id_type = /obj/item/card/id/medical/virologist
|
||||
|
||||
@@ -19,4 +19,4 @@
|
||||
shoes = /obj/item/clothing/shoes/dress/white
|
||||
suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
|
||||
gloves = /obj/item/clothing/gloves/white
|
||||
head = /obj/item/clothing/head/dress/fleet
|
||||
head = /obj/item/clothing/head/dress/fleet
|
||||
|
||||
@@ -20,4 +20,4 @@
|
||||
shoes = /obj/item/clothing/shoes/dress/white
|
||||
suit = /obj/item/clothing/suit/dress/solgov/army
|
||||
gloves = /obj/item/clothing/gloves/white
|
||||
head = /obj/item/clothing/head/dress/army
|
||||
head = /obj/item/clothing/head/dress/army
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
headset = /obj/item/radio/headset
|
||||
headset_alt = /obj/item/radio/headset
|
||||
headset_earbud = /obj/item/radio/headset
|
||||
headset_earbud = /obj/item/radio/headset
|
||||
|
||||
@@ -15,4 +15,4 @@ var/global/datum/repository/ammomaterial/ammo_repository = new()
|
||||
ammotypes[I] = temp.matter
|
||||
qdel(temp)
|
||||
|
||||
return ammotypes[I]
|
||||
return ammotypes[I]
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
timestamp += valid_duration
|
||||
|
||||
/datum/cache_entry/valid_until/is_valid()
|
||||
return world.time < timestamp
|
||||
return world.time < timestamp
|
||||
|
||||
@@ -124,4 +124,4 @@
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate/grayson
|
||||
contains = list(/obj/fiftyspawner/concrete)
|
||||
containername = "Concrete bricks crate"
|
||||
containername = "Concrete bricks crate"
|
||||
|
||||
@@ -39,4 +39,4 @@
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "keyed instruments crate"
|
||||
|
||||
// /obj/item/instrument/piano_synth/headphones
|
||||
// /obj/item/instrument/piano_synth/headphones
|
||||
|
||||
@@ -60,4 +60,4 @@ var/list/all_supply_groups = list("Atmospherics",
|
||||
|
||||
// Keeping this subtype here for posterity, so it's more apparent that this is the subtype to use if making new randomised packs
|
||||
/datum/supply_pack/randomised
|
||||
num_contained = 1
|
||||
num_contained = 1
|
||||
|
||||
@@ -148,4 +148,4 @@
|
||||
/obj/item/refill_cartridge/autoname/giftvendor)
|
||||
name = "5-pack Extra-Cheap Vendor Refill Cartridges"
|
||||
desc = "A five pack of random, discount, surplus vending machine refills."
|
||||
cost = 35
|
||||
cost = 35
|
||||
|
||||
@@ -70,4 +70,4 @@
|
||||
var/image/I = image(icon = icon, icon_state = icon_state, layer = layer)
|
||||
for(var/datum/gear_tweak/gt in tweaks)
|
||||
gt.tweak_item(I, metadata && metadata["[gt]"] ? metadata["[gt]"] : gt.get_default())
|
||||
return I
|
||||
return I
|
||||
|
||||
@@ -130,4 +130,4 @@
|
||||
|
||||
/datum/uplink_item/item/ammo/cell
|
||||
name = "weapon cell"
|
||||
path = /obj/item/cell/device/weapon
|
||||
path = /obj/item/cell/device/weapon
|
||||
|
||||
@@ -32,4 +32,4 @@
|
||||
a set of construction materials, an ionic rapier, an agent ID, energy sword, pinpointer, and a jetpack."
|
||||
item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5
|
||||
antag_roles = list("mercenary", "ert") //VOREStation Edit
|
||||
path = /obj/item/antag_spawner/syndicate_drone/mechanist
|
||||
path = /obj/item/antag_spawner/syndicate_drone/mechanist
|
||||
|
||||
@@ -66,4 +66,4 @@
|
||||
|
||||
/datum/uplink_item/item/grenades/flashbangs_singular
|
||||
name = "1xFlashbang"
|
||||
item_cost = 8
|
||||
item_cost = 8
|
||||
|
||||
@@ -53,4 +53,4 @@
|
||||
/datum/uplink_item/item/hardsuit_modules/laser_canon
|
||||
name = "Mounted Laser Cannon"
|
||||
item_cost = 80
|
||||
path = /obj/item/rig_module/mounted
|
||||
path = /obj/item/rig_module/mounted
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
name = "Integrated Surge Implant"
|
||||
item_cost = 40
|
||||
path = /obj/item/storage/box/syndie_kit/imp_aug/surge
|
||||
|
||||
|
||||
/datum/uplink_item/item/implants/imp_armblade
|
||||
name = "Integrated Armblade Implant"
|
||||
item_cost = 40
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
..(stored, path, name, amount)
|
||||
src.price = price
|
||||
src.display_color = color
|
||||
src.category = category
|
||||
src.category = category
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
spawn(50)
|
||||
if(A && !is_cut(wire))
|
||||
A.disabled = 0
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -61,4 +61,4 @@
|
||||
if(G.wire_locked_out)
|
||||
return
|
||||
G.shock(usr, 70)
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
else
|
||||
V.req_access = initial(V.req_access)
|
||||
V.req_one_access = initial(V.req_one_access)
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
switch(wire)
|
||||
if(WIRE_CONTRABAND)
|
||||
S.hacked = TRUE
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
S.safeties_enabled = 0
|
||||
spawn(10)
|
||||
S.safeties_enabled = 1
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
V.seconds_electrified = -1
|
||||
if(WIRE_IDSCAN)
|
||||
V.scan_id = 1
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
/datum/antagonist/proc/unequip(var/mob/living/carbon/human/player)
|
||||
if(!istype(player))
|
||||
return 0
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
hard_cap = 12
|
||||
hard_cap_round = 12
|
||||
initial_spawn_req = 4
|
||||
initial_spawn_target = 12
|
||||
initial_spawn_target = 12
|
||||
|
||||
@@ -65,4 +65,4 @@ var/datum/antagonist/trader/traders
|
||||
for(var/obj/item/card/id/id in W.contents)
|
||||
id.name = "[player.real_name]'s Passport"
|
||||
id.registered_name = player.real_name
|
||||
W.name = "[initial(W.name)] ([id.name])"
|
||||
W.name = "[initial(W.name)] ([id.name])"
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
//holodeck 3/29/21
|
||||
/area/holodeck/source_smoleworld
|
||||
name = "\improper Holodeck - Smolworld"
|
||||
|
||||
|
||||
/area/holodeck/source_gym
|
||||
name = "\improper Holodeck - Gym"
|
||||
|
||||
|
||||
@@ -134,4 +134,4 @@
|
||||
|
||||
/area/research_outpost/maintstore2
|
||||
name = "Maintenance Storage"
|
||||
icon_state = "auxstorage"
|
||||
icon_state = "auxstorage"
|
||||
|
||||
@@ -28,4 +28,4 @@
|
||||
new_base_path = /turf/space
|
||||
using_map.base_turf_by_z["[choice]"] = new_base_path
|
||||
message_admins("[key_name_admin(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
|
||||
log_admin("[key_name(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
|
||||
log_admin("[key_name(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
/mob/proc/changeling_engorgedglands()
|
||||
src.mind.changeling.chem_storage += 30
|
||||
src.mind.changeling.chem_recharge_rate *= 2
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -17,4 +17,4 @@
|
||||
spawn(rand(300,600))
|
||||
if(T) T.hallucination += 400
|
||||
feedback_add_details("changeling_powers","HS")
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -1 +1 @@
|
||||
//placeholder for holiday stuff
|
||||
//placeholder for holiday stuff
|
||||
|
||||
@@ -1 +1 @@
|
||||
//placeholder for holiday stuff
|
||||
//placeholder for holiday stuff
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
config_tag = "extended"
|
||||
required_players = 0
|
||||
round_description = "Just have fun and role-play!"
|
||||
extended_round_description = "There are no antagonists during extended, unless an admin decides to be cheeky. Just play your character, mess around with your job, and have fun."
|
||||
extended_round_description = "There are no antagonists during extended, unless an admin decides to be cheeky. Just play your character, mess around with your job, and have fun."
|
||||
|
||||
@@ -16,4 +16,4 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
|
||||
colony of sizable population and considerable wealth causes it to often be the target of various \
|
||||
attempts of robbery, fraud and other malicious actions."
|
||||
end_on_antag_death = 0
|
||||
antag_tags = list(MODE_RAIDER)
|
||||
antag_tags = list(MODE_RAIDER)
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
required_enemies = 2 // Bit pointless if there is only one, since its basically traitor.
|
||||
end_on_antag_death = 0
|
||||
antag_scaling_coeff = 5
|
||||
antag_tags = list(MODE_INFILTRATOR)
|
||||
antag_tags = list(MODE_INFILTRATOR)
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
/datum/malf_research_ability/process(var/time = 0)
|
||||
invested += time
|
||||
if(invested >= price)
|
||||
unlocked = 1
|
||||
unlocked = 1
|
||||
|
||||
@@ -109,5 +109,3 @@
|
||||
ticker.station_explosion_cinematic(0,null)
|
||||
if(ticker.mode)
|
||||
ticker.mode:station_was_nuked = 1
|
||||
|
||||
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
end_on_antag_death = 1
|
||||
antag_tags = list(MODE_TECHNOMANCER, MODE_CULTIST)
|
||||
require_all_templates = 1
|
||||
votable = 1
|
||||
votable = 1
|
||||
|
||||
@@ -13,4 +13,4 @@
|
||||
/datum/game_mode/infestation/create_antagonists()
|
||||
// Two of the three.
|
||||
antag_tags -= pick(antag_tags)
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
end_on_antag_death = 0
|
||||
antag_tags = list(MODE_NINJA, MODE_AUTOTRAITOR)
|
||||
round_autoantag = 1
|
||||
require_all_templates = 1
|
||||
require_all_templates = 1
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
end_on_antag_death = 0
|
||||
antag_tags = list(MODE_TECHNOMANCER, MODE_CHANGELING)
|
||||
require_all_templates = 1
|
||||
votable = 1
|
||||
votable = 1
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
end_on_antag_death = 1
|
||||
antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST, MODE_CULTIST)
|
||||
require_all_templates = 1
|
||||
votable = 0
|
||||
votable = 0
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
end_on_antag_death = 0
|
||||
antag_tags = list(MODE_TECHNOMANCER, MODE_NINJA)
|
||||
require_all_templates = 1
|
||||
votable = 1
|
||||
votable = 1
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
required_enemies = 1
|
||||
end_on_antag_death = 0
|
||||
antag_tags = list(MODE_NINJA)
|
||||
votable = 0
|
||||
votable = 0
|
||||
|
||||
@@ -37,4 +37,4 @@
|
||||
cost = 100
|
||||
obj_path = null //TODO
|
||||
one_use_only = 1
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
name = "Explosive Implant"
|
||||
desc = "A hidden implant which will explode if it hears a passphrase."
|
||||
cost = 150
|
||||
obj_path = /obj/item/storage/box/syndie_kit/imp_explosive
|
||||
obj_path = /obj/item/storage/box/syndie_kit/imp_explosive
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user