Travis: Indentation / list fixes (#1254)

Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
This commit is contained in:
SoundScopes
2016-12-19 16:40:52 +02:00
committed by skull132
parent 7267ec826c
commit 97bb1e8e38
91 changed files with 483 additions and 440 deletions
+2 -2
View File
@@ -12,7 +12,7 @@ var/list/admin_verbs_admin = list(
/client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/
/client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/
/client/proc/invisimin, /*allows our mob to go invisible/visible*/
// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage */
/datum/admins/proc/show_game_mode, /*Configuration window for the current game mode.*/
/datum/admins/proc/force_mode_latespawn, /*Force the mode to try a latespawn proc*/
/datum/admins/proc/force_antag_latespawn, /*Force a specific template to try a latespawn proc*/
@@ -35,7 +35,7 @@ var/list/admin_verbs_admin = list(
/client/proc/jumptocoord, /*we ghost and jump to a coordinate*/
/client/proc/Getmob, /*teleports a mob to our location*/
/client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/
// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage
// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage */
/client/proc/Jump,
/client/proc/jumptokey, //allows us to jump to the location of a mob with a certain ckey,
/client/proc/jumptomob, //allows us to jump to a specific mob,
+3 -3
View File
@@ -756,7 +756,7 @@ var/list/global/random_stock_large = list(
/obj/item/weapon/storage/pill_bottle/inaprovaline,
/obj/item/weapon/storage/pill_bottle/kelotane,
/obj/item/weapon/storage/pill_bottle/spaceacillin,
/obj/item/weapon/storage/pill_bottle/tramadol,
/obj/item/weapon/storage/pill_bottle/tramadol
)
var/newtype = pick(options)
new newtype(L)
@@ -1339,7 +1339,7 @@ var/list/global/random_stock_large = list(
"/obj/item/weapon/material/knife/butch" = 1,
"/obj/item/weapon/material/hatchet" = 1.5,
"/obj/item/weapon/material/hatchet/unathiknife" = 0.75,
"/obj/item/weapon/material/hatchet/tacknife" = 1,
"/obj/item/weapon/material/hatchet/tacknife" = 1
)
var/type = pickweight(blades)
@@ -1509,7 +1509,7 @@ var/list/global/random_stock_large = list(
"/obj/item/weapon/rig/ce" = 2,
"/obj/item/weapon/rig/hazmat" = 4,
"/obj/item/weapon/rig/medical" = 4,
"/obj/item/weapon/rig/hazard" = 3,
"/obj/item/weapon/rig/hazard" = 3
)
var/type = pickweight(rigs)
+2 -2
View File
@@ -21,7 +21,7 @@ var/global/list/citizenship_choices = list(
"People's Republic of Adhomai",
"Izweski Hegemony",
"Zo'ra Hive",
"K'lax Hive",
"K'lax Hive"
)
var/global/list/home_system_choices = list(
@@ -62,4 +62,4 @@ var/global/list/religion_choices = list(
"Ma'ta'ke",
"Th'akh",
"Sk'akh"
)
)
+1 -1
View File
@@ -13,7 +13,7 @@ var/global/list/gear_datums = list()
"[slot_shoes]" = list(),
"utility" = list(),
"misc" = list(),
"unknown" = list(),
"unknown" = list()
)
//create a list of gear datums to sort
+5 -5
View File
@@ -191,7 +191,7 @@ BLIND // can't see anything
var/see_invisible = -1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Resomi" = 'icons/mob/species/resomi/eyes.dmi',
"Resomi" = 'icons/mob/species/resomi/eyes.dmi'
)
/obj/item/clothing/glasses/update_clothing_icon()
@@ -216,7 +216,7 @@ BLIND // can't see anything
species_restricted = list("exclude","Unathi","Tajara","Vaurca", "Golem")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/gloves.dmi',
"Resomi" = 'icons/mob/species/resomi/gloves.dmi',
"Resomi" = 'icons/mob/species/resomi/gloves.dmi'
)
/obj/item/clothing/gloves/update_clothing_icon()
@@ -262,7 +262,7 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/hats.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_hats.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi'
)
body_parts_covered = HEAD
slot_flags = SLOT_HEAD
@@ -414,7 +414,7 @@ BLIND // can't see anything
species_restricted = list("exclude","Unathi","Tajara","Vox", "Vaurca")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/shoes.dmi',
"Resomi" = 'icons/mob/species/resomi/shoes.dmi',
"Resomi" = 'icons/mob/species/resomi/shoes.dmi'
)
/obj/item/clothing/shoes/proc/draw_knife()
@@ -500,7 +500,7 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/uniforms.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi'
)
name = "under"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+3 -3
View File
@@ -26,7 +26,7 @@
icon_state = "xenom"
item_state_slots = list(
slot_l_hand_str = "xenos_helm",
slot_r_hand_str = "xenos_helm",
slot_r_hand_str = "xenos_helm"
)
body_parts_covered = HEAD|FACE|EYES
@@ -56,7 +56,7 @@
icon_state = "captain"
item_state_slots = list(
slot_l_hand_str = "caphat",
slot_r_hand_str = "caphat",
slot_r_hand_str = "caphat"
)
body_parts_covered = 0
@@ -90,7 +90,7 @@
icon_state = "flat_cap"
item_state_slots = list(
slot_l_hand_str = "detective",
slot_r_hand_str = "detective",
slot_r_hand_str = "detective"
)
/obj/item/clothing/head/collectable/pirate
+2 -2
View File
@@ -4,7 +4,7 @@
icon_state = "helmet"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
slot_r_hand_str = "helmet"
)
item_flags = THICKMATERIAL
body_parts_covered = HEAD
@@ -110,7 +110,7 @@
icon_state = "erthelmet_cmd"
item_state_slots = list(
slot_l_hand_str = "syndicate-helm-green",
slot_r_hand_str = "syndicate-helm-green",
slot_r_hand_str = "syndicate-helm-green"
)
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
+1 -1
View File
@@ -13,7 +13,7 @@
desc = "It's good being the king."
item_state_slots = list(
slot_l_hand_str = "caphat",
slot_r_hand_str = "caphat",
slot_r_hand_str = "caphat"
)
body_parts_covered = 0
+7 -7
View File
@@ -5,7 +5,7 @@
icon_state = "centcom"
item_state_slots = list(
slot_l_hand_str = "centhat",
slot_r_hand_str = "centhat",
slot_r_hand_str = "centhat"
)
desc = "It's good to be emperor."
siemens_coefficient = 0.9
@@ -70,7 +70,7 @@
name = "red space-helmet replica"
item_state_slots = list(
slot_l_hand_str = "syndicate-helm-black-red",
slot_r_hand_str = "syndicate-helm-black-red",
slot_r_hand_str = "syndicate-helm-black-red"
)
icon_state = "syndicate"
desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
@@ -133,7 +133,7 @@
icon_state = "flat_cap"
item_state_slots = list(
slot_l_hand_str = "det_hat",
slot_r_hand_str = "det_hat",
slot_r_hand_str = "det_hat"
)
siemens_coefficient = 0.9
@@ -208,7 +208,7 @@
icon_state = "chickenhead"
item_state_slots = list(
slot_l_hand_str = "chickensuit",
slot_r_hand_str = "chickensuit",
slot_r_hand_str = "chickensuit"
)
flags_inv = BLOCKHAIR
siemens_coefficient = 0.7
@@ -226,7 +226,7 @@
icon_state = "xenos"
item_state_slots = list(
slot_l_hand_str = "xenos_helm",
slot_r_hand_str = "xenos_helm",
slot_r_hand_str = "xenos_helm"
)
desc = "A helmet made out of chitinous alien hide."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
@@ -239,11 +239,11 @@
icon_state = "philosopher_wig"
item_state_slots = list(
slot_l_hand_str = "pwig",
slot_r_hand_str = "pwig",
slot_r_hand_str = "pwig"
)
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0 //why is it so conductive?!
body_parts_covered = 0
body_parts_covered = 0
/obj/item/clothing/head/orangebandana //themij: Taryn Kifer
name = "orange bandana"
+1 -1
View File
@@ -17,7 +17,7 @@
icon_state = "welding"
item_state_slots = list(
slot_l_hand_str = "welding",
slot_r_hand_str = "welding",
slot_r_hand_str = "welding"
)
matter = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000)
var/up = 0
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "cargosoft"
item_state_slots = list(
slot_l_hand_str = "helmet", //probably a placeholder
slot_r_hand_str = "helmet",
slot_r_hand_str = "helmet"
)
var/flipped = 0
siemens_coefficient = 0.9
@@ -6,7 +6,7 @@
icon_state = "deathsquad"
item_state_slots = list(
slot_l_hand_str = "syndicate-helm-black-red",
slot_r_hand_str = "syndicate-helm-black-red",
slot_r_hand_str = "syndicate-helm-black-red"
)
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60)
item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL
@@ -32,7 +32,7 @@
charges = list(
list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3),
list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 3),
list("EMP grenade", "EMP grenade", /obj/item/weapon/grenade/empgrenade, 3),
list("EMP grenade", "EMP grenade", /obj/item/weapon/grenade/empgrenade, 3)
)
/obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
@@ -258,7 +258,7 @@
list("synaptizine", "synaptizine", 0, 30),
list("hyperzine", "hyperzine", 0, 30),
list("oxycodone", "oxycodone", 0, 30),
list("nutrients", "nutriment", 0, 80),
list("nutrients", "nutriment", 0, 80)
)
interface_name = "combat chem dispenser"
@@ -21,7 +21,7 @@
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/datajack,
/obj/item/rig_module/datajack
)
/obj/item/weapon/rig/ert/engineer
@@ -62,7 +62,7 @@
/obj/item/rig_module/ai_container,
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/grenade_launcher,
/obj/item/rig_module/mounted/egun,
/obj/item/rig_module/mounted/egun
)
/obj/item/weapon/rig/ert/assetprotection
@@ -52,7 +52,7 @@
/obj/item/rig_module/datajack,
/obj/item/rig_module/electrowarfare_suite,
/obj/item/rig_module/voice,
/obj/item/rig_module/vision,
/obj/item/rig_module/vision
)
//The cybersuit is not space-proof. It does however, have good siemens_coefficient values
@@ -30,5 +30,5 @@
/obj/item/weapon/rig/merc/empty
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/electrowarfare_suite, //might as well
)
/obj/item/rig_module/electrowarfare_suite //might as well
)
@@ -10,7 +10,7 @@
flags_inv = BLOCKHAIR
item_state_slots = list(
slot_l_hand_str = "s_helmet",
slot_r_hand_str = "s_helmet",
slot_r_hand_str = "s_helmet"
)
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
@@ -6,7 +6,7 @@
icon_state = "rig0-engineering"
item_state_slots = list(
slot_l_hand_str = "eng_helm",
slot_r_hand_str = "eng_helm",
slot_r_hand_str = "eng_helm"
)
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
@@ -26,7 +26,7 @@
icon_state = "rig0-mining"
item_state_slots = list(
slot_l_hand_str = "mining_helm",
slot_r_hand_str = "mining_helm",
slot_r_hand_str = "mining_helm"
)
armor = list(melee = 50, bullet = 5, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 20)
light_overlay = "helmet_light_dual"
@@ -45,7 +45,7 @@
icon_state = "rig0-medical"
item_state_slots = list(
slot_l_hand_str = "medical_helm",
slot_r_hand_str = "medical_helm",
slot_r_hand_str = "medical_helm"
)
armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 50)
@@ -64,7 +64,7 @@
icon_state = "rig0-sec"
item_state_slots = list(
slot_l_hand_str = "sec_helm",
slot_r_hand_str = "sec_helm",
slot_r_hand_str = "sec_helm"
)
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
light_overlay = "helmet_light_dual"
@@ -84,7 +84,7 @@
icon_state = "rig0-atmos"
item_state_slots = list(
slot_l_hand_str = "atmos_helm",
slot_r_hand_str = "atmos_helm",
slot_r_hand_str = "atmos_helm"
)
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -14,12 +14,12 @@
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi'
)
light_overlay = "helmet_light"
@@ -41,12 +41,12 @@
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi'
)
//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
@@ -5,7 +5,7 @@
icon_state = "rig0-wiz"
item_state_slots = list(
slot_l_hand_str = "wiz_helm",
slot_r_hand_str = "wiz_helm",
slot_r_hand_str = "wiz_helm"
)
unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "bio"
item_state_slots = list(
slot_l_hand_str = "bio_hood",
slot_r_hand_str = "bio_hood",
slot_r_hand_str = "bio_hood"
)
desc = "A hood that protects the head and face from biological comtaminants."
permeability_coefficient = 0.01
+4 -4
View File
@@ -4,7 +4,7 @@
icon_state = "wizard"
item_state_slots = list(
slot_l_hand_str = "wizhat",
slot_r_hand_str = "wizhat",
slot_r_hand_str = "wizhat"
)
//Not given any special protective value since the magic robes are full-body protection --NEO
siemens_coefficient = 0.7
@@ -36,7 +36,7 @@
item_state = "magus"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
slot_r_hand_str = "helmet"
)
siemens_coefficient = 0.8
body_parts_covered = HEAD|FACE|EYES
@@ -47,7 +47,7 @@
icon_state = "amp"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
slot_r_hand_str = "helmet"
)
siemens_coefficient = 0.8
@@ -57,7 +57,7 @@
icon_state = "gentcap"
item_state_slots = list(
slot_l_hand_str = "det_hat",
slot_r_hand_str = "det_hat",
slot_r_hand_str = "det_hat"
)
siemens_coefficient = 0.8
+1 -1
View File
@@ -109,7 +109,7 @@
icon_state = "detective"
item_state_slots = list(
slot_l_hand_str = "det_hat",
slot_r_hand_str = "det_hat",
slot_r_hand_str = "det_hat"
)
allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
+4 -4
View File
@@ -65,11 +65,11 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "nebula_glasses"
item_state = "nebula_glasses"
contained_sprite = 1
var/obj/item/weapon/disk/chip
/obj/item/clothing/glasses/fluff/nebula_glasses/var/chip
/obj/item/clothing/glasses/fluff/nebula_glasses/New()
chip = new /obj/item/weapon/disk/fluff/nebula_chip()
..()
/obj/item/clothing/glasses/fluff/nebula_glasses/New()
chip = new /obj/item/weapon/disk/fluff/nebula_chip()
..()
/obj/item/clothing/glasses/fluff/nebula_glasses/attack_self(mob/user as mob)
if(chip)
+1 -1
View File
@@ -11,7 +11,7 @@ var/list/dreams = list(
"the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
"the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member",
"a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell",
"a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid",
"a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid"
)
mob/living/carbon/proc/dream()
+45 -45
View File
@@ -194,7 +194,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
@@ -208,7 +208,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
@@ -222,7 +222,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
@@ -241,14 +241,14 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
/datum/recipe/muffin
reagents = list("milk" = 5, "sugar" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -276,21 +276,21 @@ I said no!
/datum/recipe/meatpie
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatpie
/datum/recipe/tofupie
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofupie
/datum/recipe/xemeatpie
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/xemeatpie
@@ -304,21 +304,21 @@ I said no!
fruit = list("cherries" = 1)
reagents = list("sugar" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
/datum/recipe/berryclafoutis
fruit = list("berries" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
/datum/recipe/wingfangchu
reagents = list("soysauce" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
@@ -333,7 +333,7 @@ I said no!
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
/obj/item/weapon/reagent_containers/food/snacks/meat/human
)
result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob
@@ -341,7 +341,7 @@ I said no!
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -349,7 +349,7 @@ I said no!
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -357,7 +357,7 @@ I said no!
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob
@@ -371,7 +371,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread
@@ -383,7 +383,7 @@ I said no!
/datum/recipe/cheesyfries
items = list(
/obj/item/weapon/reagent_containers/food/snacks/fries,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
@@ -403,7 +403,7 @@ I said no!
reagents = list("milk" = 5, "sugar" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/cookie
@@ -411,7 +411,7 @@ I said no!
reagents = list("sugar" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/paper,
/obj/item/weapon/paper
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
make_food(var/obj/container as obj)
@@ -546,14 +546,14 @@ I said no!
/datum/recipe/spellburger
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger,
/obj/item/clothing/head/wizard/fake,
/obj/item/clothing/head/wizard/fake
)
result = /obj/item/weapon/reagent_containers/food/snacks/spellburger
/datum/recipe/spellburger
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger,
/obj/item/clothing/head/wizard,
/obj/item/clothing/head/wizard
)
result = /obj/item/weapon/reagent_containers/food/snacks/spellburger
@@ -563,7 +563,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
@@ -577,7 +577,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
@@ -593,14 +593,14 @@ I said no!
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
/datum/recipe/fishandchips
items = list(
/obj/item/weapon/reagent_containers/food/snacks/fries,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
@@ -616,7 +616,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sandwich
@@ -630,7 +630,7 @@ I said no!
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
@@ -643,7 +643,7 @@ I said no!
reagents = list("psilocybin" = 5, "sugar" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
@@ -656,14 +656,14 @@ I said no!
/datum/recipe/slimetoast
reagents = list("slimejelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
/datum/recipe/jelliedtoast
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
@@ -673,7 +673,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/soydope,
/obj/item/weapon/reagent_containers/food/snacks/soydope,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/milosoup
@@ -694,7 +694,7 @@ I said no!
/datum/recipe/boiledspagetti
reagents = list("water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/spagetti
)
result = /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti
@@ -722,7 +722,7 @@ I said no!
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
@@ -733,7 +733,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -745,7 +745,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/boiledegg,
/obj/item/weapon/reagent_containers/food/snacks/boiledegg
)
result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger
@@ -777,7 +777,7 @@ I said no!
reagents = list("wine" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/twobread
@@ -785,7 +785,7 @@ I said no!
reagents = list("slimejelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
@@ -793,7 +793,7 @@ I said no!
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
@@ -809,21 +809,21 @@ I said no!
/datum/recipe/boiledslimeextract
reagents = list("water" = 5)
items = list(
/obj/item/slime_extract,
/obj/item/slime_extract
)
result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
/datum/recipe/chocolateegg
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg
/datum/recipe/sausage
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -831,7 +831,7 @@ I said no!
reagents = list("flour" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
@@ -841,7 +841,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/badrecipe,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup
@@ -909,7 +909,7 @@ I said no!
/datum/recipe/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
)
result = /obj/item/weapon/reagent_containers/food/snacks/stuffing
@@ -917,7 +917,7 @@ I said no!
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/stuffing,
/obj/item/weapon/reagent_containers/food/snacks/stuffing
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey
+1 -1
View File
@@ -29,7 +29,7 @@ var/global/list/holodeck_programs = list(
'sound/ambience/ambispace.ogg',
'sound/music/main.ogg',
'sound/music/space.ogg',
'sound/music/traitor.ogg',
'sound/music/traitor.ogg'
)
),
"picnicarea" = new/datum/holodeck_program(/area/holodeck/source_picnicarea, list('sound/music/title2.ogg')),
+1 -1
View File
@@ -98,7 +98,7 @@
"hydrazine" = -2,
"phosphorus" = -0.5,
"water" = 1,
"sodawater" = 1,
"sodawater" = 1
)
// Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order).
+2 -2
View File
@@ -200,7 +200,7 @@
list(0.100,10),
list(0.080, 5),
list(0.050, 4),
list(0.020, 5),
list(0.020, 5)
)
var/list/colors = list(
@@ -213,7 +213,7 @@
list(255, 255, 255, 0),
list( 0, 0, 0, 255),
list( 0, 0, 0, 0),
list( 0, 0, 0, 0),
list( 0, 0, 0, 0)
)
for(var/i = 1, i <= rand(1, 5), i++)
+1 -1
View File
@@ -165,7 +165,7 @@ var/list/rune_animation = list(
list(0.500, 1),
list(0.375, 1),
list(0.250, 1),
list(0.125, 1),
list(0.125, 1)
)
/var/list/rune_cache = list()
@@ -70,5 +70,5 @@
/datum/hud_data/monkey
gear = list(
"mask" = list("loc" = ui_shoes, "name" = "Mask", "slot" = slot_wear_mask, "state" = "mask", "toggle" = 1),
"back" = list("loc" = ui_sstore1, "name" = "Back", "slot" = slot_back, "state" = "back"),
"back" = list("loc" = ui_sstore1, "name" = "Back", "slot" = slot_back, "state" = "back")
)
@@ -47,7 +47,7 @@
heat_discomfort_level = 292
heat_discomfort_strings = list(
"Your feathers prickle in the heat.",
"You feel uncomfortably warm.",
"You feel uncomfortably warm."
)
cold_discomfort_level = 180
@@ -481,7 +481,7 @@
inherent_verbs = list(
/mob/living/carbon/human/proc/bugbite, //weaker version of gut.
/mob/living/carbon/human/proc/bugbite //weaker version of gut.
)
@@ -494,9 +494,8 @@
"liver" = /obj/item/organ/liver,
"kidneys" = /obj/item/organ/kidneys,
"brain" = /obj/item/organ/brain,
"eyes" = /obj/item/organ/eyes,
)
"eyes" = /obj/item/organ/eyes
)
/datum/species/bug/equip_survival_gear(var/mob/living/carbon/human/H)
..()
@@ -307,5 +307,5 @@
"o_clothing" = list("loc" = ui_belt, "name" = "Suit", "slot" = slot_wear_suit, "state" = "equip", "dir" = SOUTH),
"head" = list("loc" = ui_id, "name" = "Hat", "slot" = slot_head, "state" = "hair"),
"storage1" = list("loc" = ui_storage1, "name" = "Left Pocket", "slot" = slot_l_store, "state" = "pocket"),
"storage2" = list("loc" = ui_storage2, "name" = "Right Pocket", "slot" = slot_r_store, "state" = "pocket"),
"storage2" = list("loc" = ui_storage2, "name" = "Right Pocket", "slot" = slot_r_store, "state" = "pocket")
)
+12 -12
View File
@@ -34,18 +34,18 @@ var/list/department_radio_keys = list(
//kinda localization -- rastaf0
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
":ê" = "right ear", ".ê" = "right ear",
":ä" = "left ear", ".ä" = "left ear",
":ø" = "intercom", ".ø" = "intercom",
":ð" = "department", ".ð" = "department",
":ñ" = "Command", ".ñ" = "Command",
":ò" = "Science", ".ò" = "Science",
":ü" = "Medical", ".ü" = "Medical",
":ó" = "Engineering", ".ó" = "Engineering",
":û" = "Security", ".û" = "Security",
":ö" = "whisper", ".ö" = "whisper",
":å" = "Mercenary", ".å" = "Mercenary",
":é" = "Supply", ".é" = "Supply",
":ê" = "right ear", ".ê" = "right ear",
":ä" = "left ear", ".ä" = "left ear",
":ø" = "intercom", ".ø" = "intercom",
":ð" = "department", ".ð" = "department",
":ñ" = "Command", ".ñ" = "Command",
":ò" = "Science", ".ò" = "Science",
":ü" = "Medical", ".ü" = "Medical",
":ó" = "Engineering", ".ó" = "Engineering",
":û" = "Security", ".û" = "Security",
":ö" = "whisper", ".ö" = "whisper",
":å" = "Mercenary", ".å" = "Mercenary",
":é" = "Supply", ".é" = "Supply"
)
@@ -76,7 +76,7 @@
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
/obj/item/weapon/gun/energy/crossbow/cyborg
@@ -175,7 +175,7 @@
if(turns_since_move >= turns_per_move)
if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled
/var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND
var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND
moving_to = pick(cardinal)
dir = moving_to //How about we turn them the direction they are moving, yay.
Move(get_step(src,moving_to))
+3 -3
View File
@@ -135,7 +135,7 @@ var/list/global/base_miss_chance = list(
"l_hand" = 50,
"r_hand" = 50,
"l_foot" = 50,
"r_foot" = 50,
"r_foot" = 50
)
//Used to weight organs when an organ is hit randomly (i.e. not a directed, aimed attack).
@@ -151,7 +151,7 @@ var/list/global/organ_rel_size = list(
"l_hand" = 10,
"r_hand" = 10,
"l_foot" = 10,
"r_foot" = 10,
"r_foot" = 10
)
/proc/check_zone(zone)
@@ -185,7 +185,7 @@ var/list/global/organ_rel_size = list(
organ_rel_size["l_hand"]; "l_hand",
organ_rel_size["r_hand"]; "r_hand",
organ_rel_size["l_foot"]; "l_foot",
organ_rel_size["r_foot"]; "r_foot",
organ_rel_size["r_foot"]; "r_foot"
)
return ran_zone
@@ -100,7 +100,7 @@
"docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null,
"can_launch" = can_go && shuttle.can_launch(),
"can_cancel" = can_go && shuttle.can_cancel(),
"can_force" = can_go && shuttle.can_force(),
"can_force" = can_go && shuttle.can_force()
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -136,4 +136,4 @@
if(href_list["force"])
shuttle.force_launch(src)
else if(href_list["cancel"])
shuttle.cancel_launch(src)
shuttle.cancel_launch(src)
+1 -1
View File
@@ -187,7 +187,7 @@ var/list/admin_departments = list("[boss_name]", "Sol Government", "Supply")
/obj/machinery/photocopier/faxmachine/process()
.=..()
/var/static/ui_update_delay = 0
var/static/ui_update_delay = 0
var/current_time = world.time
if (current_time > sendtime + sendcooldown)
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/item/weapon/paper = 1,
/obj/item/weapon/newspaper = 3,
/obj/item/weapon/card/id = 3,
/obj/item/weapon/paper_bundle = 3,
/obj/item/weapon/paper_bundle = 3
)
/obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user)
+2 -1
View File
@@ -1254,7 +1254,8 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
sleep(1)
/obj/machinery/power/apc/proc/toggle_nightlight(var/force = null)
var/list/night_light_args = list( // this defines what the list level arguments are when night mode is turned on
// this defines what the list level arguments are when night mode is turned on
var/list/night_light_args = list(
/obj/machinery/light = list(6, 1),
/obj/machinery/light/small = list(4, 1)
)
+1 -1
View File
@@ -34,7 +34,7 @@
icon = 'icons/obj/gun.dmi'
item_icons = list(//DEPRECATED. USE CONTAINED SPRITES IN FUTURE
slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi'
)
icon_state = "detective"
item_state = "gun"
@@ -131,7 +131,7 @@ obj/item/weapon/gun/energy/retro
max_shots = 12
firemodes = list(
list(name="diffuse", burst=4, burst_delay = 0, move_delay = 0, fire_delay = 2, dispersion = list(1.0, -1.0, 2.0, -2.0)),
list(name="diffuse", burst=4, burst_delay = 0, move_delay = 0, fire_delay = 2, dispersion = list(1.0, -1.0, 2.0, -2.0))
)
////////Laser Tag////////////////////
@@ -62,7 +62,7 @@
charge_cost=300,
fire_delay=6,
recoil=3
),
)
)
/obj/item/weapon/gun/energy/lawgiver/proc/play_message()
@@ -13,7 +13,7 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="energystun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="energykill", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="energykill", fire_sound='sound/weapons/Laser.ogg')
)
var/crit_fail = 0 //Added crit_fail as a local variable
@@ -36,7 +36,7 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg')
)
var/lightfail = 0
@@ -126,5 +126,5 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="epistolstun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg')
)
@@ -13,12 +13,12 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg', fire_delay=null, charge_cost=null),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg', fire_delay=null, charge_cost=null),
list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg', fire_delay=25, charge_cost=400),
list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg', fire_delay=25, charge_cost=400)
)
/obj/item/weapon/gun/energy/pulse_rifle/mounted
self_recharge = 1
use_external_power = 1
use_external_power = 1
/obj/item/weapon/gun/energy/pulse_rifle/destroyer
name = "pulse destroyer"
@@ -21,7 +21,7 @@
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="eriflestun", fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="eriflekill", fire_sound='sound/weapons/Laser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="eriflekill", fire_sound='sound/weapons/Laser.ogg')
)
//action button for wielding
@@ -83,5 +83,5 @@
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
list(name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg', fire_delay=15, charge_cost=400),
list(name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg', fire_delay=15, charge_cost=400)
)
@@ -48,7 +48,7 @@
firemodes = list(
list(mode_name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"),
list(mode_name="increase yield", projectile_type=/obj/item/projectile/energy/florayield, modifystate="florayield"),
list(mode_name="increase yield", projectile_type=/obj/item/projectile/energy/florayield, modifystate="florayield")
)
/obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag)
@@ -112,7 +112,7 @@
max_shots = 9
firemodes = list(
list(name="EXTERMINATE", burst=3, burst_delay = 1, move_delay = 0, fire_delay = 0, dispersion = list(0.0, 0.2, -0.2)),
list(name="EXTERMINATE", burst=3, burst_delay = 1, move_delay = 0, fire_delay = 0, dispersion = list(0.0, 0.2, -0.2))
)
/obj/item/weapon/gun/energy/mousegun
@@ -129,7 +129,7 @@
max_shots = 6
firemodes = list(
list(name="EXTERMINATE", burst=3, burst_delay = 1, move_delay = 0, fire_delay = 3, dispersion = list(0.0, 6,0, -6.0)),
list(name="EXTERMINATE", burst=3, burst_delay = 1, move_delay = 0, fire_delay = 3, dispersion = list(0.0, 6,0, -6.0))
)
var/lightfail = 0
@@ -175,7 +175,7 @@
max_shots = 40
firemodes = list(
list(name="EXTERMINATE", burst=20, burst_delay = 1, move_delay = 20, fire_delay = 40, dispersion = list(3.0, 3.25, 3.5, 3.75, 4.0, 4.25, 4.5, 4.75, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.25)),
list(name="EXTERMINATE", burst=20, burst_delay = 1, move_delay = 20, fire_delay = 40, dispersion = list(3.0, 3.25, 3.5, 3.75, 4.0, 4.25, 4.5, 4.75, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.25))
)
/obj/item/weapon/gun/energy/vaurca/gatlinglaser
@@ -194,7 +194,7 @@
firemodes = list(
list(name="concentrated burst", burst=10, burst_delay = 1, fire_delay = 10, dispersion = list(0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9)),
list(name="spray", burst=20, burst_delay = 1, move_delay = 5, fire_delay = 30, dispersion = list(0.0, 1.25, 1.5, 1.75, 2.0, 2.25, 2.5, 2.75, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.0, 3.25)),
list(name="spray", burst=20, burst_delay = 1, move_delay = 5, fire_delay = 30, dispersion = list(0.0, 1.25, 1.5, 1.75, 2.0, 2.25, 2.5, 2.75, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.0, 3.25))
)
action_button_name = "Wield gatling laser"
@@ -238,7 +238,7 @@
firemodes = list(
list(name="single shot", burst=1, burst_delay = 1, fire_delay = 0),
list(name="concentrated burst", burst=3, burst_delay = 1, fire_delay = 5),
list(name="concentrated burst", burst=3, burst_delay = 1, fire_delay = 5)
)
/*/obj/item/weapon/gun/energy/vaurca/flamer
@@ -258,7 +258,7 @@
max_shots = 80
firemodes = list(
list(name="spray", burst = 20, burst_delay = -1, fire_delay = 10, dispersion = list(0.5, 0.5, 1.0, 1.0, 1.5, 1.5, 2.0, 2.0, 2.5, 2.5, 3.0, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.0, 6.0)),
list(name="spray", burst = 20, burst_delay = -1, fire_delay = 10, dispersion = list(0.5, 0.5, 1.0, 1.0, 1.5, 1.5, 2.0, 2.0, 2.5, 2.5, 3.0, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0, 6.0, 6.0))
)*/
/* Staves */
@@ -15,7 +15,7 @@
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1,-2,-2), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1,-2,-2), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2))
)
//Submachine guns and personal defence weapons, go.
@@ -100,7 +100,7 @@
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 0.6)),
list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
//slower to regain aim, more inaccurate if not wielding
@@ -227,7 +227,7 @@
firemodes = list(
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="long bursts", burst=8, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="long bursts", burst=8, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
)
var/cover_open = 0
@@ -307,5 +307,5 @@
firemodes = list(
list(name="single coil", burst=1, move_delay=6, accuracy = list(0)),
list(name="dual coil", burst=2, move_delay=8, accuracy = list(-2,-3), dispersion = list(2.0, 3.0)),
list(name="dual coil", burst=2, move_delay=8, accuracy = list(-2,-3), dispersion = list(2.0, 3.0))
)
@@ -62,7 +62,7 @@
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0))
)
/obj/item/weapon/gun/projectile/tanto/update_icon()
@@ -89,7 +89,7 @@
burst_delay = 0
firemodes = list(
list(mode_name="fire one barrel at a time", burst=1),
list(mode_name="fire both barrels at once", burst=2),
list(mode_name="fire both barrels at once", burst=2)
)
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet
@@ -133,108 +133,110 @@
var/find_type = 0
switch(digsite)
if(DIGSITE_GARDEN)
find_type = pick(\
100;ARCHAEO_PLANT,\
25;ARCHAEO_SHELL,\
25;ARCHAEO_FOSSIL,\
5;ARCHAEO_BEARTRAP\
find_type = pick(
100;ARCHAEO_PLANT,
25;ARCHAEO_SHELL,
25;ARCHAEO_FOSSIL,
5;ARCHAEO_BEARTRAP
)
if(DIGSITE_ANIMAL)
find_type = pick(\
100;ARCHAEO_FOSSIL,\
50;ARCHAEO_SHELL,\
50;ARCHAEO_PLANT,\
25;ARCHAEO_BEARTRAP\
find_type = pick(
100;ARCHAEO_FOSSIL,
50;ARCHAEO_SHELL,
50;ARCHAEO_PLANT,
25;ARCHAEO_BEARTRAP
)
if(DIGSITE_HOUSE)
find_type = pick(\
100;ARCHAEO_BOWL,\
100;ARCHAEO_URN,\
100;ARCHAEO_CUTLERY,\
100;ARCHAEO_STATUETTE,\
100;ARCHAEO_INSTRUMENT,\
100;ARCHAEO_PEN,\
100;ARCHAEO_LIGHTER,\
100;ARCHAEO_BOX,\
75;ARCHAEO_GASMASK,\
75;ARCHAEO_COIN,\
75;ARCHAEO_UNKNOWN,\
50;ARCHAEO_SHARD,\
50;ARCHAEO_RODS,\
25;ARCHAEO_METAL\
find_type = pick(
100;ARCHAEO_BOWL,
100;ARCHAEO_URN,
100;ARCHAEO_CUTLERY,
100;ARCHAEO_STATUETTE,
100;ARCHAEO_INSTRUMENT,
100;ARCHAEO_PEN,
100;ARCHAEO_LIGHTER,
100;ARCHAEO_BOX,
75;ARCHAEO_GASMASK,
75;ARCHAEO_COIN,
75;ARCHAEO_UNKNOWN,
50;ARCHAEO_SHARD,
50;ARCHAEO_RODS,
25;ARCHAEO_METAL
)
if(DIGSITE_TECHNICAL)
find_type = pick(\
125;ARCHAEO_GASMASK,\
100;ARCHAEO_METAL,\
100;ARCHAEO_GASTANK,\
100;ARCHAEO_TELEBEACON,\
100;ARCHAEO_TOOL,\
100;ARCHAEO_STOCKPARTS,\
75;ARCHAEO_SHARD,\
75;ARCHAEO_RODS,\
75;ARCHAEO_UNKNOWN,\
50;ARCHAEO_HANDCUFFS,\
50;ARCHAEO_BEARTRAP,\
find_type = pick(
125;ARCHAEO_GASMASK,
100;ARCHAEO_METAL,
100;ARCHAEO_GASTANK,
100;ARCHAEO_TELEBEACON,
100;ARCHAEO_TOOL,
100;ARCHAEO_STOCKPARTS,
75;ARCHAEO_SHARD,
75;ARCHAEO_RODS,
75;ARCHAEO_UNKNOWN,
50;ARCHAEO_HANDCUFFS,
50;ARCHAEO_BEARTRAP
)
if(DIGSITE_TEMPLE)
find_type = pick(\
200;ARCHAEO_CULTROBES,\
200;ARCHAEO_STATUETTE,\
100;ARCHAEO_URN,\
100;ARCHAEO_BOWL,\
100;ARCHAEO_KNIFE,\
100;ARCHAEO_CRYSTAL,\
75;ARCHAEO_CULTBLADE,\
50;ARCHAEO_SOULSTONE,\
50;ARCHAEO_UNKNOWN,\
25;ARCHAEO_HANDCUFFS,\
25;ARCHAEO_BEARTRAP,\
10;ARCHAEO_KATANA,\
10;ARCHAEO_CLAYMORE,\
10;ARCHAEO_SHARD,\
10;ARCHAEO_RODS,\
10;ARCHAEO_METAL,\
10;ARCHAEO_GASMASK,\
find_type = pick(
200;ARCHAEO_CULTROBES,
200;ARCHAEO_STATUETTE,
100;ARCHAEO_URN,
100;ARCHAEO_BOWL,
100;ARCHAEO_KNIFE,
100;ARCHAEO_CRYSTAL,
75;ARCHAEO_CULTBLADE,
50;ARCHAEO_SOULSTONE,
50;ARCHAEO_UNKNOWN,
25;ARCHAEO_HANDCUFFS,
25;ARCHAEO_BEARTRAP,
10;ARCHAEO_KATANA,
10;ARCHAEO_CLAYMORE,
10;ARCHAEO_SHARD,
10;ARCHAEO_RODS,
10;ARCHAEO_METAL,
10;ARCHAEO_GASMASK
)
if(DIGSITE_WAR)
find_type = pick(\
100;ARCHAEO_GUN,\
100;ARCHAEO_KNIFE,\
75;ARCHAEO_LASER,\
75;ARCHAEO_KATANA,\
75;ARCHAEO_CLAYMORE,\
50;ARCHAEO_UNKNOWN,\
50;ARCHAEO_CULTROBES,\
50;ARCHAEO_CULTBLADE,\
50;ARCHAEO_GASMASK,\
25;ARCHAEO_HANDCUFFS,\
25;ARCHAEO_BEARTRAP,\
25;ARCHAEO_TOOL\
find_type = pick(
100;ARCHAEO_GUN,
100;ARCHAEO_KNIFE,
75;ARCHAEO_LASER,
75;ARCHAEO_KATANA,
75;ARCHAEO_CLAYMORE,
50;ARCHAEO_UNKNOWN,
50;ARCHAEO_CULTROBES,
50;ARCHAEO_CULTBLADE,
50;ARCHAEO_GASMASK,
25;ARCHAEO_HANDCUFFS,
25;ARCHAEO_BEARTRAP,
25;ARCHAEO_TOOL
)
return find_type
var/list/responsive_carriers = list( \
"carbon", \
"potassium", \
"hydrogen", \
"nitrogen", \
"mercury", \
"iron", \
"chlorine", \
"phosphorus", \
"phoron")
var/list/responsive_carriers = list(
"carbon",
"potassium",
"hydrogen",
"nitrogen",
"mercury",
"iron",
"chlorine",
"phosphorus",
"phoron"
)
var/list/finds_as_strings = list( \
"Trace organic cells", \
"Long exposure particles", \
"Trace water particles", \
"Crystalline structures", \
"Metallic derivative", \
"Metallic composite", \
"Metamorphic/igneous rock composite", \
"Metamorphic/sedimentary rock composite", \
"Anomalous material" )
var/list/finds_as_strings = list(
"Trace organic cells",
"Long exposure particles",
"Trace water particles",
"Crystalline structures",
"Metallic derivative",
"Metallic composite",
"Metamorphic/igneous rock composite",
"Metamorphic/sedimentary rock composite",
"Anomalous material"
)
#undef ARCHAEO_BOWL
#undef ARCHAEO_URN
+2 -2
View File
@@ -44,7 +44,7 @@
"door_state" = docking_program.memory["door_status"]["state"],
"door_lock" = docking_program.memory["door_status"]["lock"],
"can_force" = pod.can_force() || (emergency_shuttle.departed && pod.can_launch()), //allow players to manually launch ahead of time if the shuttle leaves
"is_armed" = pod.arming_controller.armed,
"is_armed" = pod.arming_controller.armed
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -91,7 +91,7 @@
data = list(
"docking_status" = docking_program.get_docking_status(),
"override_enabled" = docking_program.override_enabled,
"armed" = armed,
"armed" = armed
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+1 -1
View File
@@ -55,7 +55,7 @@
"docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null,
"can_launch" = shuttle.can_launch(),
"can_cancel" = shuttle.can_cancel(),
"can_force" = shuttle.can_force(),
"can_force" = shuttle.can_force()
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+1 -1
View File
@@ -220,7 +220,7 @@
"can_force" = shuttle.can_force(src),
"auth_list" = auth_list,
"has_auth" = has_auth,
"user" = debug? user : null,
"user" = debug? user : null
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+4 -4
View File
@@ -16,9 +16,9 @@
/datum/surgery_step/generic/cut_face
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
min_duration = 90
@@ -134,4 +134,4 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("\red [user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \
"\red Your hand slips, leaving a small burn on [target]'s face with \the [tool]!")
target.apply_damage(4, BURN, affected)
target.apply_damage(4, BURN, affected)
+5 -5
View File
@@ -109,9 +109,9 @@
/datum/surgery_step/generic/cut_open
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
min_duration = 90
@@ -152,8 +152,8 @@
/datum/surgery_step/generic/cut_openvaurca
allowed_tools = list(
/obj/item/weapon/surgicaldrill = 85, \
/obj/item/weapon/pickaxe/ = 15, \
/obj/item/weapon/surgicaldrill = 85,
/obj/item/weapon/pickaxe/ = 15
)
min_duration = 110
+4 -4
View File
@@ -101,9 +101,9 @@
/datum/surgery_step/internal/detatch_organ
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
min_duration = 90
@@ -357,4 +357,4 @@
// max_duration = 40
// can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
// return ..() && target.op_stage.ribcage == 2
// return ..() && target.op_stage.ribcage == 2
+5 -5
View File
@@ -55,9 +55,9 @@
/datum/surgery_step/fix_dead_tissue //Debridement
priority = 2
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
can_infect = 1
@@ -103,7 +103,7 @@
/obj/item/weapon/reagent_containers/glass/bottle = 75,
/obj/item/weapon/reagent_containers/glass/beaker = 75,
/obj/item/weapon/reagent_containers/spray = 50,
/obj/item/weapon/reagent_containers/glass/bucket = 50,
/obj/item/weapon/reagent_containers/glass/bucket = 50
)
can_infect = 0
@@ -207,4 +207,4 @@
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='danger'>[user]'s [tool] can't quite seem to get through the metal...</span>", \
"<span class='danger'>Your [tool] can't quite seem to get through the metal. It's weakening, though - try again.</span>")
"<span class='danger'>Your [tool] can't quite seem to get through the metal. It's weakening, though - try again.</span>")
+5 -5
View File
@@ -196,9 +196,9 @@
/datum/surgery_step/robotics/fix_organ_robotic //For artificial organs
allowed_tools = list(
/obj/item/stack/nanopaste = 100, \
/obj/item/weapon/bonegel = 30, \
/obj/item/weapon/screwdriver = 70, \
/obj/item/stack/nanopaste = 100,
/obj/item/weapon/bonegel = 30,
/obj/item/weapon/screwdriver = 70
)
min_duration = 70
@@ -314,7 +314,7 @@
/datum/surgery_step/robotics/attach_organ_robotic
allowed_tools = list(
/obj/item/weapon/screwdriver = 100,
/obj/item/weapon/screwdriver = 100
)
min_duration = 100
@@ -427,4 +427,4 @@
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'>[user]'s hand slips.</span>", \
"<span class='warning'>Your hand slips.</span>")
"<span class='warning'>Your hand slips.</span>")
+7 -7
View File
@@ -11,9 +11,9 @@
/datum/surgery_step/slime/cut_flesh
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
min_duration = 30
@@ -37,9 +37,9 @@
/datum/surgery_step/slime/cut_innards
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
)
min_duration = 30
@@ -90,4 +90,4 @@
fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \
"\red Your hand slips, causing you to miss the core!")
"\red Your hand slips, causing you to miss the core!")