mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +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
@@ -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
|
||||
..()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user