This commit is contained in:
silicons
2020-11-12 23:36:18 -07:00
parent 803bff4e5f
commit 5b03f5b0ec
88 changed files with 88 additions and 88 deletions

View File

@@ -70,4 +70,4 @@
/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/__distance_check(atom/movable/AM, OldLoc, Dir, Forced)
if(get_dist(src, AM) > gravity_power_range)
remove_gravity(AM)
remove_gravity(AM)

View File

@@ -130,4 +130,4 @@
/mob/living/simple_animal/hostile/guardian/ranged/Recall(forced)
// To stop scout mode from moving when recalled
incorporeal_move = FALSE
. = ..()
. = ..()

View File

@@ -292,4 +292,4 @@
if(mecha)
walk_to(mecha, target, minimum_distance, mecha.step_in)
else
..()
..()

View File

@@ -190,4 +190,4 @@
/obj/item/clothing/accessory/pandora_hope/on_uniform_dropped(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(L && L.mind)
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hope_lavaland")
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hope_lavaland")

View File

@@ -57,4 +57,4 @@
casingtype = /obj/item/ammo_casing/c46x30mm
projectilesound = 'sound/weapons/gunshot_smg.ogg'
loot = list(/obj/item/gun/ballistic/automatic/wt550,
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)

View File

@@ -81,4 +81,4 @@
casingtype = /obj/item/ammo_casing/c46x30mm
projectilesound = 'sound/weapons/gunshot_smg.ogg'
loot = list(/obj/item/gun/ballistic/automatic/wt550,
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)

View File

@@ -53,4 +53,4 @@
/datum/emote/slime/mood/angry
key = "moodangry"
mood = "angry"
mood = "angry"

View File

@@ -76,4 +76,4 @@
slime_mutation[2] = colour
slime_mutation[3] = colour
slime_mutation[4] = colour
return(slime_mutation)
return(slime_mutation)

View File

@@ -177,4 +177,4 @@ If radio_freq is not null, the code will rely on the fact that the speaker is vi
This is fairly hacky, but it means that I can advoid using istypes. It's mainly relevant for AI tracking and AI job display.
That's all, folks!*/
That's all, folks!*/

View File

@@ -68,4 +68,4 @@
return
/mob/proc/update_inv_ears()
return
return

View File

@@ -20,4 +20,4 @@ Contents:
#define DRAIN_RD_HACK_FAILED "RDHACKFAIL"
#define DRAIN_MOB_SHOCK "MOBSHOCK"
#define DRAIN_MOB_SHOCK_FAILED "MOBSHOCKFAIL"
#define DRAIN_MOB_SHOCK_FAILED "MOBSHOCKFAIL"

View File

@@ -56,4 +56,4 @@
if(mend)
P.stat &= ~NOPOWER
else
P.stat |= NOPOWER
P.stat |= NOPOWER

View File

@@ -37,4 +37,4 @@
if(fuel < wanted)
wanted = fuel
fuel -= wanted
return wanted
return wanted

View File

@@ -77,4 +77,4 @@
above = locate(/obj/machinery/power/deck_relay) in(SSmapping.get_turf_above(T))
if(below || above)
icon_state = "cablerelay-on"
return TRUE
return TRUE

View File

@@ -98,4 +98,4 @@
if(avail >= 1000)
return clamp(round(avail/10000), 10, 90) + rand(-5,5)
else
return 0
return 0

View File

@@ -1,4 +1,4 @@
/area/engine/engineering/poweralert(state, source)
if (state != poweralm)
investigate_log("has a power alarm!", INVESTIGATE_SINGULO)
..()
..()

View File

@@ -16,4 +16,4 @@
endTurfZ = z
mapGenerator = new mapGeneratorType()
mapGenerator.defineRegion(locate(startTurfX,startTurfY,startTurfZ), locate(endTurfX,endTurfY,endTurfZ))
mapGenerator.generate()
mapGenerator.generate()

View File

@@ -143,4 +143,4 @@ Variable Breakdown (For Mappers):
*/
*/

View File

@@ -46,4 +46,4 @@
/datum/mapGenerator/asteroid/filled
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
buildmode_name = "Block: Asteroid Walls"
buildmode_name = "Block: Asteroid Walls"

View File

@@ -93,4 +93,4 @@
b_rule = list(3)
s_rule = list(1,2,3,4,5)
iterations = 20
edge_value = 0
edge_value = 0

View File

@@ -33,4 +33,4 @@
ricochets_max = 2
ricochet_chance = 60
ricochet_auto_aim_range = 4
ricochet_incidence_leeway = 35
ricochet_incidence_leeway = 35

View File

@@ -163,4 +163,4 @@ obj/item/ammo_casing/shotgun/executioner
projectile_type = /obj/item/projectile/bullet/pellet/shotgun_incapacitate
pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face.
variance = 25
custom_materials = list(/datum/material/iron=4000)
custom_materials = list(/datum/material/iron=4000)

View File

@@ -24,4 +24,4 @@
/obj/item/ammo_casing/energy/buster
e_cost = 25
projectile_type = /obj/item/projectile/energy/buster
fire_sound = 'sound/weapons/mmlbuster.ogg'
fire_sound = 'sound/weapons/mmlbuster.ogg'

View File

@@ -80,4 +80,4 @@
/obj/item/ammo_casing/energy/pickle //ammo for an adminspawn gun
projectile_type = /obj/item/projectile/energy/pickle
select_name = "pickle ray"
e_cost = 0
e_cost = 0

View File

@@ -23,4 +23,4 @@
/obj/item/ammo_box/magazine/mm712x82/match
name = "box magazine (Match 7.12x82mm)"
ammo_type = /obj/item/ammo_casing/mm712x82/match
ammo_type = /obj/item/ammo_casing/mm712x82/match

View File

@@ -113,4 +113,4 @@
name = "'MWS' microbattery - ION"
type_color = "#d084d6"
type_name = "<span class='ion'>ION</span>"
projectile_type = /obj/item/projectile/ion
projectile_type = /obj/item/projectile/ion

View File

@@ -3,4 +3,4 @@
ammo_type = /obj/item/ammo_casing/caseless/arrow
caliber = "arrow"
max_ammo = 1
start_empty = 1
start_empty = 1

View File

@@ -54,4 +54,4 @@
/obj/item/ammo_box/magazine/internal/shot/bounty
name = "triple-barrel shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/incapacitate
max_ammo = 3
max_ammo = 3

View File

@@ -24,4 +24,4 @@
item_state = "mmlbuster"
w_class = WEIGHT_CLASS_SMALL
ammo_type = list(/obj/item/ammo_casing/energy/buster)
ammo_x_offset = 2
ammo_x_offset = 2

View File

@@ -336,4 +336,4 @@
desc = "funniest shit i've ever seen"
icon_state = "decloner"
no_pin_required = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/pickle)
ammo_type = list(/obj/item/ammo_casing/energy/pickle)

View File

@@ -44,4 +44,4 @@
syringes_left++
if(chambered && !chambered.BB)
chambered.newshot()
last_synth = world.time
last_synth = world.time

View File

@@ -138,4 +138,4 @@
/obj/item/projectile/bullet/pellet/shotgun_incapacitate
name = "incapacitating pellet"
damage = 1
stamina = 6
stamina = 6

View File

@@ -31,4 +31,4 @@ obj/item/projectile/energy/plasmabolt
eyeblur = 4
irradiate = 25
stamina = 100
icon_state = "plasma3"
icon_state = "plasma3"

View File

@@ -14,4 +14,4 @@
return BULLET_ACT_HIT
/obj/item/projectile/ion/weak
emp_radius = 0
emp_radius = 0

View File

@@ -20,4 +20,4 @@
/obj/item/projectile/temp/cryo
name = "cryo beam"
range = 3
temperature = -240 // Single slow shot reduces temp greatly
temperature = -240 // Single slow shot reduces temp greatly

View File

@@ -18,4 +18,4 @@
else
mixcolor = BlendRGB(R.color, mixcolor, vol_temp/vol_counter)
return mixcolor
return mixcolor

View File

@@ -209,4 +209,4 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
dat += " above [recipe.required_temp] degrees"
dat += "."
info = dat.Join("")
update_icon()
update_icon()

View File

@@ -432,4 +432,4 @@
/obj/item/reagent_containers/glass/bottle/ichor/green
name = "green potion"
list_reagents = list(/datum/reagent/green_ichor = 1)
list_reagents = list(/datum/reagent/green_ichor = 1)

View File

@@ -48,4 +48,4 @@
obj/item/reagent_containers/chem_pack/attack_self(mob/user)
if(sealed)
return
..()
..()

View File

@@ -46,4 +46,4 @@
return null
#undef MULTIZ_PIPE_UP
#undef MULTIZ_PIPE_DOWN
#undef MULTIZ_PIPE_DOWN

View File

@@ -114,4 +114,4 @@
build_path = /obj/item/pet_carrier/bluespace
materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 600)
category = list("Bluespace Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

View File

@@ -72,4 +72,4 @@
id = "solarcontrol"
build_path = /obj/item/circuitboard/computer/solar_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

View File

@@ -90,4 +90,4 @@
id = "aifixer"
build_path = /obj/item/circuitboard/computer/aifixer
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

View File

@@ -52,4 +52,4 @@
materials = list(/datum/material/iron=16000, /datum/material/glass = 8000, /datum/material/diamond = 2000, /datum/material/gold = 6000, /datum/material/silver = 6000, /datum/material/uranium = 10000, /datum/material/plasma = 8000, /datum/material/titanium = 16000)
construction_time = 100
category = list("Misc")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

View File

@@ -40,4 +40,4 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 75)
build_path = /obj/item/melee/synthetic_arm_blade
category = list("other","emagged")
category = list("other","emagged")

View File

@@ -39,4 +39,4 @@
id = "ore_redemption"
build_path = /obj/item/circuitboard/machine/ore_redemption
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING

View File

@@ -103,4 +103,4 @@
id = "thermomachine"
build_path = /obj/item/circuitboard/machine/thermomachine
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

View File

@@ -38,4 +38,4 @@
name = "department techfab (Security)"
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
department_tag = "Security"
circuit = /obj/item/circuitboard/machine/techfab/department/security
circuit = /obj/item/circuitboard/machine/techfab/department/security

View File

@@ -414,4 +414,4 @@
/datum/techweb/specialized/autounlocking/autobottler
design_autounlock_buildtypes = AUTOBOTTLER
allowed_buildtypes = AUTOBOTTLER
allowed_buildtypes = AUTOBOTTLER

View File

@@ -86,4 +86,4 @@
prereq_ids = list("sticky_basic")
design_ids = list("super_sticky_tape", "pointy_tape")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
hidden = TRUE
hidden = TRUE

View File

@@ -10,4 +10,4 @@
gold_core_spawnable = NO_SPAWN
speak_emote = list("blorbles", "bubbles", "borks")
emote_hear = list("bubbles!", "splorts.", "splops!")
emote_see = list("gets goop everywhere.", "flops.", "jiggles!")
emote_see = list("gets goop everywhere.", "flops.", "jiggles!")

View File

@@ -135,4 +135,4 @@ Recurring extracts:
/obj/item/slimecross/recurring/rainbow
extract_type = /obj/item/slime_extract/rainbow
colour = "rainbow"
max_cooldown = 20 //It's pretty powerful.
max_cooldown = 20 //It's pretty powerful.

View File

@@ -252,4 +252,4 @@ Regenerative extracts:
colour = "rainbow"
/obj/item/slimecross/regenerative/rainbow/core_effect(mob/living/target, mob/user)
target.apply_status_effect(STATUS_EFFECT_RAINBOWPROTECTION)
target.apply_status_effect(STATUS_EFFECT_RAINBOWPROTECTION)

View File

@@ -137,4 +137,4 @@ Self-sustaining extracts:
/obj/item/slimecross/selfsustaining/rainbow
extract_type = /obj/item/slime_extract/rainbow
colour = "rainbow"
colour = "rainbow"

View File

@@ -163,4 +163,4 @@ Stabilized extracts:
regencore = regen
regen.forceMove(src)
return
return ..()
return ..()

View File

@@ -2,4 +2,4 @@
/obj/item/paper/fluff/stations/lavaland/sloth/note
name = "note from sloth"
desc = "have not gotten around to finishing my cursed item yet sorry - sloth"
desc = "have not gotten around to finishing my cursed item yet sorry - sloth"

View File

@@ -32,4 +32,4 @@
The crew has all been invited to the main hall, where we have seats for the initial FTL acceleration. Unfortunately the clone cannot leave the quarantine room \
without risking infection, so we will strap him into the bed and hope for the best. We can grow another clone if anything goes wrong, anyway.
<br>
<i>Professor Galen Linkovich</i>"}
<i>Professor Galen Linkovich</i>"}

View File

@@ -115,4 +115,4 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
/obj/machinery/porta_turret/shuttleRotate(rotation, params)
. = ..()
if(wall_turret_direction && (params & ROTATE_DIR))
wall_turret_direction = turn(wall_turret_direction,rotation)
wall_turret_direction = turn(wall_turret_direction,rotation)

View File

@@ -13,4 +13,4 @@
continue
explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
return
return

View File

@@ -41,4 +41,4 @@
for(var/A in mutations)
target.dna.remove_mutation(A)
for(var/A in traits)
REMOVE_TRAIT(target, A, GENETICS_SPELL)
REMOVE_TRAIT(target, A, GENETICS_SPELL)

View File

@@ -23,4 +23,4 @@
name = "Arcane Barrage"
desc = "Fire a torrent of arcane energy at your foes with this (powerful) spell. Requires both hands free to use. Learning this spell makes you unable to learn Lesser Summon Gun."
action_icon_state = "arcane_barrage"
summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage
summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage

View File

@@ -54,4 +54,4 @@
target.blur_eyes(amt_eye_blurry)
//summoning
if(summon_type)
new summon_type(target.loc, target)
new summon_type(target.loc, target)

View File

@@ -195,4 +195,4 @@
/obj/item/book/granter/spell/mimery_guns/attack_self(mob/user)
..()
if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)

View File

@@ -43,4 +43,4 @@
power_mod = 0.1
cooldown_mod = 0.5
spans = list("clown")
speech_sound = 'sound/spookoween/scary_horn2.ogg'
speech_sound = 'sound/spookoween/scary_horn2.ogg'

View File

@@ -28,4 +28,4 @@
active = TRUE
/datum/bioware/proc/on_lose()
return
return

View File

@@ -11,4 +11,4 @@
var/datum/bioware/B = X
if(B.mod_type == bioware_target)
return FALSE
return TRUE
return TRUE

View File

@@ -42,4 +42,4 @@
/datum/bioware/hooked_ligaments/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_LIMBATTACHMENT, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")
REMOVE_TRAIT(owner, TRAIT_EASYDISMEMBER, "ligament_hook")

View File

@@ -42,4 +42,4 @@
/datum/bioware/reinforced_ligaments/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments")
REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments")

View File

@@ -39,4 +39,4 @@
/datum/bioware/muscled_veins/on_lose()
..()
REMOVE_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins")
REMOVE_TRAIT(owner, TRAIT_STABLEHEART, "muscled_veins")

View File

@@ -34,4 +34,4 @@
/datum/surgery_step/toxichealing/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] screws up!", "<span class='warning'>You screwed up!</span>")
target.take_bodypart_damage(25,0)
return FALSE
return FALSE

View File

@@ -290,4 +290,4 @@
. |= HAND_LEFT
if(ARM_RIGHT)
. |= HAND_RIGHT
. |= L.body_part
. |= L.body_part

View File

@@ -38,4 +38,4 @@
target.reagents.reaction(owner, INGEST)
target.reagents.trans_to(owner, target.reagents.total_volume)
qdel(target)
return 1
return 1

View File

@@ -44,4 +44,4 @@
"<span class='warning'>[user] screws up!</span>")
H.losebreath += 4
H.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10)
return FALSE
return FALSE

View File

@@ -188,4 +188,4 @@
/datum/surgery_step/add_plating/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_results(user, target, "<span class='notice'>You begin to add plating to [target]'s [parse_zone(target_zone)]...</span>",
"[user] begins to add plating to [target]'s [parse_zone(target_zone)].",
"[user] begins to add plating to [target]'s [parse_zone(target_zone)].")
"[user] begins to add plating to [target]'s [parse_zone(target_zone)].")

View File

@@ -276,4 +276,4 @@
/obj/item/organ/tongue/arachnid/Initialize(mapload)
. = ..()
languages_possible = languages_possible_arachnid
languages_possible = languages_possible_arachnid

View File

@@ -132,4 +132,4 @@
name = "repair damage"
brutehealing = 10
burnhealing = 10
missinghpbonus = 15
missinghpbonus = 15

View File

@@ -175,4 +175,4 @@
//RESOLVED ISSUES //"Todo" jobs that have been completed
//combine hands/feet into the arms - Hands/feet were removed - RR
//surgeries (not steps) that can be initiated on any body part (corresponding with damage locations) - Call this one done, see possible_locs var - c0
//surgeries (not steps) that can be initiated on any body part (corresponding with damage locations) - Call this one done, see possible_locs var - c0

View File

@@ -1,3 +1,3 @@
/datum/unit_test/timer_sanity/Run()
if(SStimer.bucket_count < 0)
Fail("SStimer is going into negative bucket count from something")
Fail("SStimer is going into negative bucket count from something")

View File

@@ -34,4 +34,4 @@
result = 0
//Return 1 to superhook
return result
return result

View File

@@ -87,4 +87,4 @@ in their list
var/atom/movable/thing = new path(loc)
thing.deserialize(data)
return thing
return thing

View File

@@ -91,4 +91,4 @@
<li>Optionally: Inject chemical into foods and drinks to further spread possible infection</li>\
<li>???</li>\
<li>Complete assigned objectives amidst the chaos</li>\
</ul>"
</ul>"

View File

@@ -10,4 +10,4 @@
if(owner)
owner.remove_mentor_verbs()
owner.mentor_datum = null
..()
..()

View File

@@ -5,4 +5,4 @@
if(!GLOB.mentorlog.len)
dat += "No mentors have done anything this round!"
usr << browse(dat, "window=mentor_log")
usr << browse(dat, "window=mentor_log")

View File

@@ -42,4 +42,4 @@
/mob/living/proc/clear_screams()
LAZYINITLIST(alternate_screams)
LAZYCLEARLIST(alternate_screams)
LAZYCLEARLIST(alternate_screams)

View File

@@ -1,3 +1,3 @@
/obj/item/ammo_box/magazine/wt550m9/wttx
name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
ammo_type = /obj/item/ammo_casing/c46x30mm/tx
ammo_type = /obj/item/ammo_casing/c46x30mm/tx

View File

@@ -1,4 +1,4 @@
/obj/item/projectile/bullet/c46x30mm_tx
name = "toxin tipped 4.6x30mm bullet"
damage = 10
damage_type = TOX
damage_type = TOX

View File

@@ -64,4 +64,4 @@
icon_state = "spinfusorbox"
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
w_class = WEIGHT_CLASS_NORMAL
max_ammo = 4
max_ammo = 4

View File

@@ -150,4 +150,4 @@ proc
if (size <= length)
return message
else
return copytext(message, 1, length + 1)
return copytext(message, 1, length + 1)