massive burndown (#29894)

This commit is contained in:
Contrabang
2025-07-27 13:52:39 -07:00
committed by GitHub
parent a596fba80d
commit 1504ed98be
1043 changed files with 0 additions and 3598 deletions
-6
View File
@@ -223,14 +223,11 @@
icon_state = "rcd"
item_state = "rcd"
flags = CONDUCT | NOBLUDGEON
force = 0
throwforce = 10
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 30000)
origin_tech = "engineering=4;materials=2"
toolspeed = 1
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(ACCESS_ENGINE)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
@@ -722,9 +719,6 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
opacity = FALSE
density = FALSE
anchored = FALSE
origin_tech = "materials=3"
materials = list(MAT_METAL=16000, MAT_GLASS=8000)
new_attack_chain = TRUE
-3
View File
@@ -4,12 +4,9 @@
icon = 'icons/obj/tools.dmi'
icon_state = "rcl-0"
item_state = "rcl-0"
opacity = FALSE
force = 5 //Plastic is soft
throwforce = 5
throw_speed = 1
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "engineering=4;materials=2"
var/max_amount = 90
var/active = FALSE
-4
View File
@@ -8,11 +8,7 @@
icon = 'icons/obj/tools.dmi'
icon_state = "rsf"
item_state = "rsf"
opacity = FALSE
density = FALSE
anchored = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
w_class = WEIGHT_CLASS_NORMAL
var/atom/currently_dispensing
var/power_mode = POWER_NONE
@@ -27,10 +27,8 @@
initial_access = list(ACCESS_SYNDICATE)
assignment = "Syndicate Researcher"
icon_state = "syndie"
untrackable = TRUE
/obj/item/card/id/syndicate/vox
name = "agent card"
initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_VOX, ACCESS_EXTERNAL_AIRLOCKS)
/obj/item/card/id/syndicate/ghost_bar
@@ -12,7 +12,6 @@
throwforce_on = 5
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
w_class_on = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "slashed", "gored", "sliced", "torn", "ripped", "butchered", "cut")
attack_verb_on = list()
@@ -27,7 +26,6 @@
/obj/item/reagent_containers/spray/alien/smoke
name = "smokescreen module"
desc = "Releases a dense smoke cloud that cannot be seen through. Your thermal vision is still able to see targets through it."
icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-smoke"
list_reagents = list("water" = 50)
@@ -53,7 +51,6 @@
/obj/item/reagent_containers/spray/alien/acid
name = "polyacid synthesizer"
desc = "Sprays concentrated polyacid."
icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-acid"
list_reagents = list("facid" = 125, "sacid" = 125)
@@ -13,7 +13,6 @@
item_state = "classic_baton"
slot_flags = ITEM_SLOT_BELT
force = 12 //9 hit crit
w_class = WEIGHT_CLASS_NORMAL
// Settings
/// Whether the baton can stun silicon mobs
var/affect_silicon = FALSE
@@ -154,7 +153,6 @@
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
icon_state = "telebaton_0" // For telling what it is when mapping
item_state = null
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
on = FALSE
/// Force when concealed
@@ -3,7 +3,6 @@
desc = "Returns you to the mothership."
icon = 'icons/obj/abductor.dmi'
icon_state = "implant"
activated = BIOCHIP_ACTIVATED_ACTIVE
origin_tech = "materials=2;biotech=7;magnets=4;bluespace=4;abductor=5"
implant_data = /datum/implant_fluff/abductor
implant_state = "implant-alien"
@@ -4,7 +4,6 @@
icon = 'icons/obj/bio_chips.dmi'
icon_state = "implantcase"
item_state = "implantcase"
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=2"
@@ -3,7 +3,6 @@
/obj/item/bio_chip/dust
name = "duster bio-chip"
desc = "A remote controlled bio-chip that will dust the user upon activation (or death of user)."
icon = 'icons/obj/bio_chips.dmi'
icon_state = "dust"
actions_types = list(/datum/action/item_action/hands_free/activate/always)
trigger_causes = BIOCHIP_TRIGGER_DEATH_ONCE | BIOCHIP_TRIGGER_NOT_WHEN_GIBBED
@@ -98,7 +98,6 @@
/obj/item/bio_chip/explosive/macro
name = "macrobomb bio-chip"
desc = "And boom goes the weasel. And everything else nearby."
icon_state = "explosive"
origin_tech = "materials=3;combat=5;biotech=4;syndicate=5"
weak = 16
medium = 8
@@ -39,12 +39,9 @@
/obj/item/bio_chip/freedom/prototype
name = "prototype freedom bio-chip"
desc = "Use this to escape from those evil Red Shirts. Works only once!"
icon_state = "freedom"
item_color = "r"
origin_tech = "combat=5;magnets=3;biotech=3;syndicate=1"
uses = 1
implant_data = /datum/implant_fluff/protofreedom
implant_state = "implant-syndicate"
/obj/item/bio_chip_implanter/freedom/prototype
name = "bio-chip implanter (proto-freedom)"
@@ -3,10 +3,8 @@
desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs."
icon = 'icons/obj/wizard.dmi'
icon_state ="scroll2"
activated = BIOCHIP_ACTIVATED_ACTIVE
origin_tech = "materials=2;biotech=4;combat=5;syndicate=4"
implant_data = /datum/implant_fluff/krav_maga
implant_state = "implant-default"
var/datum/martial_art/krav_maga/style = new
@@ -1,7 +1,6 @@
/obj/item/bio_chip/grey_autocloner
name = "technocracy cloning bio-chip"
desc = "Allows for advanced instantanious cloning!"
icon_state = "generic"
origin_tech = "materials=3;combat=5;syndicate=2"
activated = FALSE
trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY
@@ -9,7 +9,6 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=2;biotech=3"
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
toolspeed = 1
var/obj/item/bio_chip/imp
var/obj/item/bio_chip/implant_type
@@ -11,7 +11,6 @@
desc = "The C-Foam launcher. Shoots blobs of quickly hardening and growing foam. Can be used to slow down humanoids or block airlocks"
icon_state = "c_foam_launcher"
item_state = "c_foam_launcher"
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;syndicate=1;materials=3"
needs_permit = FALSE
@@ -369,13 +369,11 @@
add_fingerprint(user)
/obj/item/card/id/silver
name = "identification card"
desc = "A silver card which shows honour and dedication."
icon_state = "silver"
item_state = "silver_id"
/obj/item/card/id/gold
name = "identification card"
desc = "A golden card which shows power and might."
icon_state = "gold"
item_state = "gold_id"
@@ -596,7 +594,6 @@
/obj/item/card/id/captains_spare/assigned
name = "Captain ID"
registered_name = "Captain"
icon_state = "captain"
/obj/item/card/id/hop
-3
View File
@@ -4,10 +4,7 @@
icon = 'icons/obj/money.dmi'
icon_state = "cash"
hitsound = "swing_hit"
force = 0
throwforce = 0
throw_speed = 1
throw_range = 7
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
singular_name = "credit"
@@ -10,7 +10,6 @@
throwforce = 10
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK
materials = list(MAT_METAL = 5000)
resistance_flags = FIRE_PROOF
@@ -46,7 +46,6 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
w_class = WEIGHT_CLASS_NORMAL
flags = NODROP | DROPDEL
ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
can_charge = FALSE
@@ -141,7 +140,6 @@
/obj/item/ammo_casing/energy/chrono_beam
name = "eradication beam"
projectile_type = /obj/item/projectile/energy/chrono_beam
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
muzzle_flash_color = null
icon = 'icons/obj/projectiles.dmi'
icon_state = "chronobolt"
@@ -152,7 +150,6 @@
desc = "An aura of time-bluespace energy."
icon = 'icons/effects/effects.dmi'
icon_state = "chronofield"
density = FALSE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
move_resist = INFINITY
-2
View File
@@ -23,7 +23,6 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cig"
lefthand_file = 'icons/mob/inhands/smoking_lefthand.dmi'
righthand_file = 'icons/mob/inhands/smoking_righthand.dmi'
slot_flags = ITEM_SLOT_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
@@ -435,7 +434,6 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/cigbutt/syndie
name = "suspicious cigarette butt"
desc = "A manky old cigarette butt with an evil look about it."
icon = 'icons/obj/clothing/smoking.dmi'
icon_state = "syndie_cig_butt"
/obj/item/cigbutt/Initialize(mapload)
@@ -12,7 +12,6 @@
/obj/item/bikehorn
name = "bike horn"
desc = "A horn off of a bicycle."
icon = 'icons/obj/items.dmi'
icon_state = "bike_horn"
item_state = "bike_horn"
hitsound = null
@@ -75,7 +74,6 @@
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
throwforce = 0
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
actions_types = list(/datum/action/item_action/laugh_track)
@@ -1,7 +1,6 @@
/obj/item/lipstick
name = "red lipstick"
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon_state = "lipstick"
w_class = WEIGHT_CLASS_TINY
var/colour = "red"
@@ -100,12 +99,10 @@
/obj/item/razor
name = "electric razor"
desc = "The latest and greatest power razor born from the science of shaving."
icon = 'icons/obj/items.dmi'
icon_state = "razor"
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
usesound = 'sound/items/welder2.ogg'
toolspeed = 1
/obj/item/razor/attack__legacy__attackchain(mob/living/carbon/M as mob, mob/user as mob)
if(ishuman(M))
@@ -5,7 +5,6 @@
/obj/item/gavelhammer
name = "gavel hammer"
desc = "Order, order! No bombs in my courthouse."
icon = 'icons/obj/items.dmi'
icon_state = "gavelhammer"
force = 5.0
throwforce = 6.0
@@ -21,7 +20,6 @@
/obj/item/gavelblock
name = "gavel block"
desc = "Smack it with a gavel hammer when the assistants get rowdy."
icon = 'icons/obj/items.dmi'
icon_state = "gavelblock"
force = 2.0
throwforce = 2.0
-5
View File
@@ -247,7 +247,6 @@
item_state = "defibnt"
paddle_type = /obj/item/shockpaddles/advanced
combat = TRUE
safety = TRUE
hardened = TRUE // EMP-proof (on the component), but not emag-proof.
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Objective item, better not have it destroyed.
heart_attack_probability = 10
@@ -293,11 +292,9 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
force = 0
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
resistance_flags = INDESTRUCTIBLE
toolspeed = 1
base_icon_state = "defibpaddles"
/// Amount of power used on a shock.
var/revivecost = 1000
@@ -424,12 +421,10 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
force = 0
w_class = WEIGHT_CLASS_BULKY
var/revivecost = 1000
var/safety = TRUE
flags = NODROP
toolspeed = 1
/obj/item/borg_defib/Initialize(mapload)
. = ..()
-3
View File
@@ -4,7 +4,6 @@
desc = "Contains all the luck you'll ever need."
icon = 'icons/obj/dice.dmi'
icon_state = "dicebag"
use_sound = "rustle"
storage_slots = 50
max_combined_w_class = 50
can_hold = list(/obj/item/dice)
@@ -124,7 +123,6 @@
/obj/item/dice/d20/fate
name = "\improper Die of Fate"
desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
icon_state = "d20"
var/reusable = TRUE
var/used = FALSE
@@ -418,7 +416,6 @@
/obj/item/storage/box/dice
name = "Box of dice"
desc = "ANOTHER ONE!? FUCK!"
icon_state = "box"
/obj/item/storage/box/dice/populate_contents()
new /obj/item/dice/d2(src)
-1
View File
@@ -8,7 +8,6 @@
/obj/item/disk/data
name = "Cloning Data Disk"
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
var/datum/dna2_record/buf = null
var/read_only = FALSE //Well,it's still a floppy disk
@@ -7,7 +7,6 @@
det_time = 10
display_timer = FALSE
origin_tech = "syndicate=1"
toolspeed = 1
var/atom/target = null
var/image_overlay = null
var/obj/item/assembly/nadeassembly = null
@@ -1,16 +1,12 @@
/obj/item/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
icon = 'icons/obj/items.dmi'
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
base_icon_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
throwforce = 10
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 7
force = 10
container_type = AMOUNT_VISIBLE
materials = list(MAT_METAL = 200)
@@ -11,7 +11,6 @@
throwforce = 10
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 5000)
resistance_flags = FIRE_PROOF
origin_tech = "combat=1;plasmatech=2;engineering=2"
@@ -10,7 +10,6 @@
/obj/item/a_gift
name = "gift"
desc = "PRESENTS!!!! eek!"
icon = 'icons/obj/items.dmi'
icon_state = "gift1"
item_state = "gift1"
resistance_flags = FLAMMABLE
@@ -2,9 +2,7 @@
name = "plasma fire grenade"
desc = "A compressed plasma grenade, used to start horrific plasma fires."
origin_tech = "materials=3;magnets=4;syndicate=3"
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "grenade"
var/spawn_contents = LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS
var/spawn_amount = 100
@@ -33,9 +31,7 @@
/obj/item/grenade/gluon
desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also wet any nearby floors."
name = "gluon grenade"
icon = 'icons/obj/grenade.dmi'
icon_state = "gluon"
item_state = "grenade"
var/freeze_range = 4
var/rad_damage = 1400
var/stamina_damage = 30
@@ -4,10 +4,7 @@
/obj/item/grenade/bananade
name = "bananade"
desc = "A yellow grenade."
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/grenade.dmi'
icon_state = "banana"
item_state = "grenade"
var/deliveryamt = 8
var/spawner_type = /obj/item/grown/bananapeel
@@ -6,10 +6,8 @@
name = "grenade casing"
desc = "A do it yourself grenade casing!"
icon_state = "chemg"
item_state = "grenade"
var/bomb_state = "chembomb"
var/payload_name = null // used for spawned grenades
w_class = WEIGHT_CLASS_SMALL
force = 2
var/prime_sound = 'sound/items/screwdriver2.ogg'
var/stage = EMPTY
@@ -394,7 +392,6 @@
desc = "A custom made pyrotechnical grenade. It heats up and ignites its contents upon detonation."
icon_state = "pyrog"
origin_tech = "combat=4;engineering=4"
affected_area = 3
ignition_temp = 500 // This is enough to expose a hotspot.
/// Intended for weaker, but longer lasting effects. Could have some interesting uses.
@@ -2,8 +2,6 @@
name = "Banana Grenade"
desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
icon_state = "banana"
item_state = "grenade"
w_class = WEIGHT_CLASS_SMALL
force = 2.0
var/stage = 0
var/state = 0
@@ -4,7 +4,6 @@
/obj/item/grenade/clusterbuster
name = "clusterbang"
desc = "Use of this weapon may constitute a war crime in your area, consult your local captain."
icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
item_state = "flashbang"
var/payload = /obj/item/grenade/flashbang/cluster
@@ -39,7 +38,6 @@
/obj/item/grenade/clusterbuster/segment
name = "clusterbang bomblet"
desc = "A bomblet released by a clusterbang. Better run!"
icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang_segment"
/obj/item/grenade/clusterbuster/segment/Initialize(mapload, payload_type = /obj/item/grenade/flashbang/cluster)
@@ -4,7 +4,6 @@
name = "fragmentation grenade"
desc = "A grenade with a specially designed casing that will launch lethal fragments in all directions upon detonation. Fire in the hole!"
icon_state = "frag"
item_state = "grenade"
origin_tech = "materials=3;magnets=4"
/// How much shrapnel the grenade will launch.
var/shrapnel_contained = 20
@@ -21,8 +20,6 @@
name = "stingball grenade"
desc = "A specialized less-lethal hand grenade used for police action. Launches hard rubber balls in all directions upon detonation."
icon_state = "stinger"
item_state = "grenade"
det_time = 5 SECONDS
modifiable_timer = FALSE
shrapnel_contained = 50
embedded_type = /obj/item/projectile/bullet/pellet/rubber/stinger
@@ -3,16 +3,8 @@
/obj/item/grenade/iedcasing
name = "improvised firebomb"
desc = "A sketchy improvised incendiary device."
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
item_state = "grenade"
throw_speed = 3
throw_range = 7
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
active = FALSE
det_time = 5 SECONDS
display_timer = FALSE
modifiable_timer = FALSE
var/list/times
@@ -1,12 +1,10 @@
/obj/item/grenade/smokebomb
name = "smoke bomb"
desc = "A grenade filled with chemical agents that will turn into a dense smoke when detonated, making it impossible to see through without specialised optics."
icon = 'icons/obj/grenade.dmi'
icon_state = "smoke"
det_time = 2 SECONDS
modifiable_timer = FALSE
item_state = "smoke"
slot_flags = ITEM_SLOT_BELT
var/datum/effect_system/smoke_spread/bad/smoke
/obj/item/grenade/smokebomb/Initialize(mapload)
@@ -1,9 +1,7 @@
/obj/item/grenade/spawnergrenade
name = "delivery grenade"
desc = "Upon detonation, this will unleash an unspecified anomaly into the vicinity."
icon = 'icons/obj/grenade.dmi'
icon_state = "delivery"
item_state = "grenade"
origin_tech = "materials=3;magnets=4"
var/spawner_type = null // must be an object path
var/deliveryamt = 1 // amount of type to deliver
@@ -35,7 +33,6 @@
/obj/item/grenade/spawnergrenade/manhacks
name = "viscerator delivery grenade"
desc = "This grenade contains 5 viscerators, tiny flying drones with lethally sharp blades. Upon detonation, they will be deployed and begin searching the area for targets."
spawner_type = /mob/living/simple_animal/hostile/viscerator
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=3"
@@ -1,9 +1,7 @@
/obj/item/grenade/syndieminibomb
name = "\improper Syndicate minibomb"
desc = "A Syndicate-manufactured high-explosive grenade used to sow destruction and chaos."
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "grenade"
origin_tech = "materials=3;magnets=4;syndicate=3"
var/explosion_cause = "Syndicate minibomb"
@@ -47,7 +47,6 @@
slot_flags = ITEM_SLOT_BELT
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=500)
origin_tech = "engineering=3;combat=3"
@@ -211,7 +210,6 @@
/obj/item/restraints/handcuffs/cable/zipties
name = "zipties"
desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
icon_state = "cablecuff"
breakouttime = 45 SECONDS
materials = list()
trashtype = /obj/item/restraints/handcuffs/cable/zipties/used
@@ -5,11 +5,8 @@
icon_state = "signmaker"
item_state = "electronic"
belt_icon = "holosign_creator"
force = 0
w_class = WEIGHT_CLASS_SMALL
throwforce = 0
throw_speed = 3
throw_range = 7
origin_tech = "magnets=1;programming=3"
flags = NOBLUDGEON
var/list/signs = list()
@@ -116,7 +113,6 @@
icon_state = "signmaker_engi"
belt_icon = null
holosign_type = /obj/structure/holosign/barrier/atmos
creation_time = 0
max_signs = 3
/obj/item/holosign_creator/cyborg
@@ -198,7 +198,6 @@
desc = "Capable of cutting clean through a holy claymore."
icon_state = "katana"
item_state = "katana"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
/obj/item/nullrod/claymore/multiverse
name = "extradimensional blade"
@@ -273,7 +272,6 @@
icon = 'icons/obj/guns/magic.dmi'
name = "dormant spellblade"
desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/nullrod/scythe/talking
name = "possessed blade"
@@ -284,7 +282,6 @@
item_state = "talking_sword"
desc = "When the station falls into chaos, it's nice to have a friend by your side."
attack_verb = list("chopped", "sliced", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
force = 12
can_be_hit = TRUE // be a shit and you can get your ass beat
max_integrity = 100
@@ -484,12 +481,10 @@
/obj/item/nullrod/claymore/bostaff
name = "monk's staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
icon = 'icons/obj/weapons/melee.dmi'
icon_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
item_state = "bostaff0"
w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = ITEM_SLOT_BACK
sharp = FALSE
@@ -27,14 +27,12 @@
righthand_file = 'icons/mob/inhands/utensil_righthand.dmi'
force = 5.0
w_class = WEIGHT_CLASS_TINY
throwforce = 0.0
throw_speed = 3
throw_range = 5
flags = CONDUCT
attack_verb = list("attacked", "stabbed", "poked")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
sharp = FALSE
var/max_contents = 1
/obj/item/kitchen/utensil/New()
@@ -168,7 +166,6 @@
name = "butcher's cleaver"
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
flags = CONDUCT
force = 15
throwforce = 8
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -242,8 +239,6 @@
force = 8.0
throwforce = 10.0
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
/* Trays moved to /obj/item/storage/bag */
@@ -261,7 +256,6 @@
throwforce = 5
throw_speed = 3
throw_range = 3
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
/obj/item/reagent_containers/cooking/mould/make_mini()
@@ -315,7 +309,6 @@
/obj/item/kitchen/cutter
name = "generic circular cutter"
desc = "A generic circular cutter for cookies and other things."
icon = 'icons/obj/kitchen.dmi'
icon_state = "circular_cutter"
force = 5
throwforce = 5
@@ -66,7 +66,6 @@
name = "engraved knuckleduster"
desc = "Perfect for giving that Greytider a golden, painful lesson."
icon_state = "knuckleduster_nt"
force = 10
throwforce = 5
origin_tech = null
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Steal objectives shouldnt be easy to destroy.
@@ -5,8 +5,6 @@
icon_state = "handcuff"
cuffed_state = "legcuff"
flags = CONDUCT
throwforce = 0
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "engineering=3;combat=3"
slowdown = 7
breakouttime = 30 SECONDS
@@ -8,7 +8,6 @@
icon_state = "lighter-g"
item_state = "lighter-g"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
attack_verb = null
@@ -378,7 +377,6 @@
desc = "A little flame of your own, currently located dangerously in your mouth."
icon_state = "match_unathi"
attack_verb = null
force = 0
flags = DROPDEL | ABSTRACT
origin_tech = null
lit = TRUE
@@ -20,7 +20,6 @@
/obj/item/book/manual
//While piracy is a heinious deed, we don't want people uploading programmatic books into the player book DB for obvious reasons
copyright = TRUE
protected = FALSE //No reason players shouldn't write in regular manuals
name = "Book Manual"
desc = "Please make a report on the github if you somehow get ahold of one of these in-game."
summary = "This is a manual procured by Nanotrasen, it contains important information!"
@@ -581,7 +580,6 @@
name = "APLU \"Ripley\" Construction and Operation Manual"
desc = "A small guidebook on how to operate a Ripley powerloader exosuit. It's filled with disclaimers and pre-signed waivers."
summary = "Standard operational practices and construction requirements for operation of the Ripley mk. 3 powerloader system."
icon_state ="book"
author = "Hephaestus Industries"
title = "APLU \"Ripley\" Construction and Operation Manual"
@@ -838,7 +836,6 @@
/obj/item/book/manual/wiki
name = "Wiki Book Manual"
desc = "This REALLY shouldn't exist in-game, please contact a coder."
copyright = TRUE
protected = TRUE //We absolutely do not want players editing these books, it might fuck up the iframes in them :)
pages = null //we don't want people opening this book until it fully initializes
//Wiki Iframes need a decent bit of room, this will be enough to make the readable without having to expand the window immediately
@@ -37,10 +37,8 @@
var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
usesound = 'sound/weapons/blade1.ogg'
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
toolspeed = 1
light_power = 2
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -326,9 +324,7 @@
/obj/item/melee/energy/sword/cyborg/saw
name = "energy saw"
desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
force_on = 30
force = 18 //About as much as a spear
sharp = TRUE
hitsound = 'sound/weapons/circsawhit.ogg'
icon = 'icons/obj/surgery.dmi'
icon_state = "esaw_0"
@@ -365,7 +361,6 @@
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
icon_state = "blade"
force = 30 //Normal attacks deal esword damage
hitsound = 'sound/weapons/blade1.ogg'
throwforce = 1//Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
@@ -397,7 +392,6 @@
force = 12
force_on = 20 //force when active
throwforce = 20
throwforce_on = 20
icon = 'icons/obj/lavaland/artefacts.dmi'
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
@@ -8,7 +8,6 @@
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=5"
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
hitsound = 'sound/weapons/slash.ogg' //pls replace
@@ -36,7 +35,6 @@
item_state = "candy_sword"
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("slashed", "stabbed", "sliced", "caned")
// MARK: FLYSWATTER
@@ -250,7 +250,6 @@
plane = GRAVITY_PULSE_PLANE
appearance_flags = PIXEL_SCALE|LONG_GLIDE
duration = 0.5 SECONDS
mouse_opacity = MOUSE_OPACITY_TRANSPARENT // Let us not have this visual block clicks
/// Who we are orbiting
var/target
/// A funky color matrix to recolor the slash to
@@ -31,7 +31,6 @@
flags = CONDUCT
force = 5.0
throwforce = 7.0
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled")
@@ -137,7 +136,6 @@
/obj/item/gift
name = "gift"
desc = "A wrapped item."
icon = 'icons/obj/items.dmi'
icon_state = "gift3"
var/size = 3.0
var/obj/item/gift = null
@@ -196,7 +194,6 @@
/obj/item/phone
name = "red phone"
desc = "Should anything ever go wrong..."
icon = 'icons/obj/items.dmi'
icon_state = "red_phone"
flags = CONDUCT
force = 3
-2
View File
@@ -10,8 +10,6 @@
force = 3
throwforce = 5
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
new_attack_chain = TRUE
@@ -13,7 +13,6 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,20,30,50,70)
volume = 70
container_type = OPENCONTAINER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
/obj/item/reagent_containers/glass/paint/interact_with_atom(atom/target, mob/living/user, list/modifiers)
@@ -7,8 +7,6 @@
attack_verb = list("whacked", "fisted", "power-punched")
force = 12
throwforce = 10
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 40)
resistance_flags = FIRE_PROOF
origin_tech = "combat=5;powerstorage=3;syndicate=3"
-4
View File
@@ -13,15 +13,11 @@
desc = "This device can rapidly dispense atmospherics and disposals piping, manipulate loose piping, and recycle any detached pipes it is applied to."
icon = 'icons/obj/tools.dmi'
icon_state = "rpd"
opacity = FALSE
density = FALSE
anchored = FALSE
flags = CONDUCT
force = 10
throwforce = 10
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
@@ -8,13 +8,11 @@
w_class = WEIGHT_CLASS_SMALL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("slices", "cuts", "stabs", "jabs")
toolspeed = 1
/obj/item/scissors/barber
name = "Barber's Scissors"
desc = "A pair of scissors used by a barber."
icon_state = "bscissor"
item_state = "scissor"
attack_verb = list("beautifully sliced", "artistically cut", "smoothly stabbed", "quickly jabbed")
toolspeed = 0.75
@@ -24,7 +24,6 @@
slot_flags = ITEM_SLOT_BACK
force = 10
throwforce = 5
throw_speed = 2
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_GLASS=7500, MAT_METAL=1000)
-1
View File
@@ -7,7 +7,6 @@
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 4
throw_range = 20
discrete = 1
-2
View File
@@ -21,7 +21,6 @@
/obj/item/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
item_state = "broom0"
@@ -65,7 +64,6 @@
/obj/item/staff/broom/horsebroom
name = "broomstick horse"
desc = "Saddle up!"
icon = 'icons/obj/wizard.dmi'
icon_state = "horsebroom"
item_state = "horsebroom0"
@@ -18,11 +18,9 @@
use_to_pickup = TRUE
allow_quick_gather = TRUE
allow_quick_empty = TRUE
pickup_all_on_tile = TRUE
display_contents_with_number = TRUE
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 100
toolspeed = 1
usesound = 'sound/items/rped.ogg'
var/works_from_distance = FALSE
var/primary_sound = 'sound/items/rped.ogg'
@@ -81,7 +79,6 @@
item_state = "BS_RPED"
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 400
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 800
works_from_distance = TRUE
primary_sound = 'sound/items/pshoom.ogg'
@@ -116,7 +113,6 @@
icon = 'icons/obj/stock_parts.dmi'
w_class = WEIGHT_CLASS_SMALL
var/rating = 1
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
//Rank 1
@@ -173,7 +169,6 @@
/obj/item/stock_parts/scanning_module/adv
name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "adv_scan_module"
item_state = "adv_scan_module"
origin_tech = "magnets=3"
@@ -182,7 +177,6 @@
/obj/item/stock_parts/manipulator/nano
name = "nano-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "nano_mani"
item_state = "nano_mani"
origin_tech = "materials=3;programming=2"
@@ -191,7 +185,6 @@
/obj/item/stock_parts/micro_laser/high
name = "high-power micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "high_micro_laser"
item_state = "high_micro_laser"
origin_tech = "magnets=3"
@@ -200,7 +193,6 @@
/obj/item/stock_parts/matter_bin/adv
name = "advanced matter bin"
desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "advanced_matter_bin"
item_state = "advanced_matter_bin"
origin_tech = "materials=3"
@@ -229,7 +221,6 @@
/obj/item/stock_parts/manipulator/pico
name = "pico-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "pico_mani"
item_state = "pico_mani"
origin_tech = "materials=4;programming=4;engineering=4"
@@ -240,14 +231,12 @@
name = "ultra-high-power micro-laser"
icon_state = "ultra_high_micro_laser"
item_state = "ultra_high_micro_laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=4;engineering=4"
rating = 3
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/stock_parts/matter_bin/super
name = "super matter bin"
desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "super_matter_bin"
item_state = "super_matter_bin"
origin_tech = "materials=4;engineering=4"
@@ -276,7 +265,6 @@
/obj/item/stock_parts/manipulator/femto
name = "femto-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "femto_mani"
item_state = "femto_mani"
origin_tech = "materials=6;programming=4;engineering=4"
@@ -287,14 +275,12 @@
name = "quad-ultra micro-laser"
icon_state = "quadultra_micro_laser"
item_state = "quadultra_micro_laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5;materials=4;engineering=4"
rating = 4
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/stock_parts/matter_bin/bluespace
name = "bluespace matter bin"
desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "bluespace_matter_bin"
item_state = "bluespace_matter_bin"
origin_tech = "materials=6;programming=4;engineering=4"
@@ -15,7 +15,6 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
resistance_flags = NONE
max_integrity = 300
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi',
@@ -98,8 +97,6 @@
desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state = "giftbag0"
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 400 // can store a ton of shit!
/obj/item/storage/backpack/cultpack
@@ -175,7 +172,6 @@
desc = "It's a fireproof backpack for Atmospherics Staff."
icon_state = "atmospack"
item_state = "atmospack"
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/explorer
name = "explorer bag"
@@ -782,7 +778,6 @@
desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
icon_state = "holyflask"
color = "#DC0000"
volume = 100
list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
/obj/item/reagent_containers/drinks/bottle/immortality
@@ -37,7 +37,6 @@
belt_icon = "trashbag"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
max_w_class = WEIGHT_CLASS_SMALL
slot_flags = null
storage_slots = 30
max_combined_w_class = 30
@@ -118,10 +117,7 @@
icon_state = "plasticbag"
item_state = "plasticbag"
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_SMALL
storage_slots = 7
display_contents_with_number = 0 //or else this will lead to stupid behavior.
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
@@ -163,7 +159,6 @@
origin_tech = "engineering=2"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 10
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
max_w_class = WEIGHT_CLASS_NORMAL
@@ -298,7 +293,6 @@
/obj/item/storage/bag/plants/seed_sorting_tray
name = "seed sorting tray"
desc = "A simple wooden tray with compartments for manually sorting seeds. It's better than nothing, but a plant analyzer would be more effective."
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "seed_sorting_tray"
can_hold = list(
/obj/item/seeds,
@@ -322,7 +316,6 @@
////////////////////////////////////////
/obj/item/storage/bag/cash
icon = 'icons/obj/storage.dmi'
icon_state = "cashbag"
name = "Cash bag"
desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
@@ -342,7 +335,6 @@
icon = 'icons/obj/library.dmi'
icon_state = "bookbag"
display_contents_with_number = 0 //This would look really stupid otherwise
storage_slots = 7
max_combined_w_class = 21
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
@@ -568,7 +560,6 @@
origin_tech = "engineering=2"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 15
max_combined_w_class = 60
max_w_class = WEIGHT_CLASS_NORMAL
@@ -73,8 +73,6 @@
/obj/item/storage/belt/utility
name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
desc = "Can hold various tools."
icon_state = "utilitybelt"
item_state = "utility"
use_item_overlays = TRUE
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
@@ -221,13 +219,10 @@
)
/obj/item/storage/belt/medical/surgery
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 17
use_to_pickup = TRUE
name = "surgical belt"
desc = "Can hold various surgical tools."
storage_slots = 9
use_item_overlays = TRUE
can_hold = list(
/obj/item/scalpel,
/obj/item/hemostat,
@@ -372,7 +367,6 @@
item_state = "federationwebbing"
storage_slots = 15
max_combined_w_class = 25
use_item_overlays = FALSE
layer_over_suit = TRUE
w_class_override = list(
/obj/item/crowbar,
@@ -422,7 +416,6 @@
desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear."
icon_state = "militarybelt"
item_state = "military"
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 18
resistance_flags = FIRE_PROOF
use_item_overlays = TRUE // Will show the tools on the sprite
@@ -716,7 +709,6 @@
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
storage_slots = 3
max_w_class = WEIGHT_CLASS_SMALL
/obj/item/storage/belt/fannypack/black
name = "black fannypack"
@@ -861,7 +853,6 @@
item_state = "holdingbelt"
storage_slots = 14
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
can_hold = list()
@@ -884,7 +875,6 @@
storage_slots = 6
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
allow_quick_empty = TRUE
can_hold = list(
/obj/item/grenade/smokebomb,
@@ -998,7 +988,6 @@
storage_slots = 6
max_w_class = WEIGHT_CLASS_BULKY
max_combined_w_class = 20
use_item_overlays = FALSE
layer_over_suit = TRUE
can_hold = list(
/obj/item/crowbar,
@@ -6,7 +6,6 @@
icon_state ="bible"
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FIRE_PROOF
drop_sound = 'sound/items/handling/book_drop.ogg'
pickup_sound = 'sound/items/handling/book_pickup.ogg'
@@ -53,9 +52,7 @@
return TRUE // Don't run the fart emote
/obj/item/storage/bible/booze
name = "bible"
desc = "To be applied to the head repeatedly."
icon_state ="bible"
/obj/item/storage/bible/booze/populate_contents()
new /obj/item/reagent_containers/drinks/bottle/beer(src)
@@ -186,5 +183,4 @@
/obj/item/storage/bible/syndi
name = "suspicious bible"
desc = "For treading the line between cultist, contraband, and a hostile corporation."
customisable = FALSE
icon_state = "syndi"
@@ -396,7 +396,6 @@
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkey_box"
storage_slots = 7
can_hold = list(/obj/item/food/monkeycube)
var/monkey_cube_type = /obj/item/food/monkeycube
@@ -1069,7 +1068,6 @@
icon = 'icons/obj/storage.dmi'
icon_state = "paperbag_None"
item_state = "paperbag_None"
resistance_flags = FLAMMABLE
foldable = null
var/design = NODESIGN
@@ -1301,7 +1299,6 @@
/obj/item/storage/box/wizard/hardsuit
name = "battlemage armour bundle"
desc = "This box contains a bundle of Battlemage Armour."
icon_state = "wizard_box"
/obj/item/storage/box/wizard/hardsuit/populate_contents()
new /obj/item/clothing/suit/space/hardsuit/wizard(src)
@@ -7,7 +7,6 @@
hitsound = "swing_hit"
use_sound = 'sound/effects/briefcase.ogg'
force = 8
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
@@ -378,7 +378,6 @@
icon_state = "solar_packet"
item_state = "solar_packet"
cigarette_slogan = "Smoked by true patriots."
cigarette_type = /obj/item/clothing/mask/cigarette
/obj/item/storage/fancy/cigarettes/cigpack_uplift
name = "\improper Uplift Smooth packet"
@@ -449,10 +448,7 @@
desc = "A locked box for keeping things away from children."
icon = 'icons/obj/vialbox.dmi'
icon_state = "vialbox0"
item_state = "syringe_kit"
max_w_class = WEIGHT_CLASS_NORMAL
can_hold = list(/obj/item/reagent_containers/glass/bottle)
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
req_access = list(ACCESS_VIROLOGY)
@@ -491,8 +487,6 @@
name = "aquatic starter kit"
desc = "It's a starter kit box for an aquarium."
icon_state = "AquaticKit"
throw_speed = 2
throw_range = 8
med_bot_skin = "fish"
/obj/item/storage/firstaid/aquatic_kit/full
@@ -12,7 +12,6 @@
name = "generic first-aid kit"
desc = "If you can see this, make a bug report on GitHub, something went wrong!"
icon_state = "genericfirstaid"
throw_speed = 2
throw_range = 8
req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
var/treatment_brute = "salglu_solution"
@@ -176,7 +175,6 @@
treatment_oxy = "perfluorodecalin"
treatment_brute = "bicaridine"
treatment_fire = "kelotane"
treatment_tox = "charcoal"
req_one_access = list(ACCESS_SYNDICATE)
med_bot_skin = "bezerk"
syndicate_aligned = TRUE
@@ -5,7 +5,6 @@
item_state = "syringe_kit"
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(ACCESS_ARMORY)
var/locked = TRUE
@@ -119,7 +118,6 @@
name = "medal box"
desc = "A locked box used to store medals of honor."
icon_state = "medalbox+l"
item_state = "syringe_kit"
w_class = WEIGHT_CLASS_NORMAL
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 20
@@ -12,9 +12,6 @@
// -----------------------------
/obj/item/storage/secure
name = "secstorage"
w_class = WEIGHT_CLASS_NORMAL
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 14
var/icon_locking = "secureb"
var/icon_sparking = "securespark"
var/icon_opened = "secure0"
@@ -203,14 +200,12 @@
/obj/item/storage/secure/briefcase
name = "secure briefcase"
desc = "A large briefcase with a digital locking system."
icon = 'icons/obj/storage.dmi'
icon_state = "secure"
item_state = "sec-case"
flags = CONDUCT
hitsound = "swing_hit"
use_sound = 'sound/effects/briefcase.ogg'
force = 8
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
@@ -249,7 +244,6 @@
/obj/item/storage/secure/safe
name = "secure safe"
icon = 'icons/obj/storage.dmi'
icon_state = "safe"
icon_opened = "safe0"
icon_locking = null
@@ -258,7 +252,6 @@
w_class = WEIGHT_CLASS_HUGE
max_w_class = 8
anchored = TRUE
density = FALSE
cant_hold = list(/obj/item/storage/secure/briefcase)
/obj/item/storage/secure/safe/attack_hand(mob/user as mob)
@@ -8,7 +8,6 @@
/obj/item/storage
name = "storage"
icon = 'icons/obj/storage.dmi'
w_class = WEIGHT_CLASS_NORMAL
flags_2 = BLOCKS_LIGHT_2
/// No message on putting items in.
var/silent = FALSE
@@ -8,8 +8,6 @@
flags = CONDUCT
force = 10
throwforce = 10
throw_speed = 2
throw_range = 7
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
@@ -501,7 +501,6 @@
new /obj/item/reagent_containers/syringe/pancuronium(src)
/obj/item/storage/box/syndie_kit/nuke
name = "box" //Bit of stealth, since you spawn with it
desc = "It's just an ordinary box."
icon_state = "box"
@@ -511,7 +510,6 @@
new /obj/item/paper/guides/antag/nuke_instructions(src)
/obj/item/storage/box/syndie_kit/supermatter
name = "box"
desc = "It's just an ordinary box."
icon_state = "box"
@@ -390,7 +390,6 @@
icon_state = "swarmprod"
base_icon = "swarmprod"
item_state = "swarmprod"
force = 10
throwforce = 0 // Just in case
knockdown_duration = 6 SECONDS
knockdown_delay = 0 SECONDS
@@ -138,7 +138,6 @@
item_state = "jetpack-void"
/obj/item/tank/jetpack/void/grey
name = "Void Jetpack (Oxygen)"
icon_state = "jetpack-void-grey"
item_state = "jetpack-void-grey"
@@ -150,8 +149,6 @@
/obj/item/tank/jetpack/oxygen
name = "Jetpack (Oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
item_state = "jetpack"
/obj/item/tank/jetpack/oxygen/harness
name = "jet harness (oxygen)"
@@ -59,7 +59,6 @@
name = "plasma tank"
desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
icon_state = "plasma"
flags = CONDUCT
slot_flags = null //they have no straps!
force = 8
@@ -130,7 +129,6 @@
name = "emergency oxygen tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
w_class = WEIGHT_CLASS_SMALL
@@ -213,7 +211,6 @@
/obj/item/tank/internals/generic
name = "gas tank"
desc = "A generic tank used for storing and transporting gasses. Can be used for internals."
icon_state = "generic"
item_state = "generic"
/obj/item/tank/internals/generic/populate_gas()
@@ -4,7 +4,6 @@
flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/smash.ogg'
w_class = WEIGHT_CLASS_NORMAL
pressure_resistance = ONE_ATMOSPHERE * 5
force = 5
throwforce = 10
@@ -9,7 +9,6 @@
slot_flags = ITEM_SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
@@ -115,8 +114,6 @@
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(25,50,100)
volume = 500
flags = NOBLUDGEON
container_type = OPENCONTAINER
var/obj/item/watertank/tank
@@ -158,7 +155,6 @@
//Janitor tank
/obj/item/watertank/janitor
name = "backpack water tank"
desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
icon_state = "waterbackpackjani"
item_state = "waterbackpackjani"
@@ -170,7 +166,6 @@
/obj/item/reagent_containers/spray/mister/janitor
name = "janitor spray nozzle"
desc = "A janitorial spray nozzle attached to a watertank, designed to clean up large messes."
icon = 'icons/obj/watertank.dmi'
icon_state = "misterjani"
item_state = "misterjani"
spray_maxrange = 4
@@ -200,7 +195,6 @@
desc = "A refridgerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, nanofrost launcher, and metal foam dispenser for breaches. Nanofrost converts plasma in the air to nitrogen, but only if it is combusting at the time."
icon_state = "waterbackpackatmos"
item_state = "waterbackpackatmos"
volume = 500
/obj/item/watertank/atmos/New()
..()
@@ -357,7 +351,6 @@
/obj/effect/nanofrost_container
name = "nanofrost container"
desc = "A frozen shell of ice containing nanofrost that freezes the surrounding area after activation."
icon = 'icons/effects/effects.dmi'
icon_state = "frozen_smoke_capsule"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE
@@ -12,7 +12,6 @@
icon = 'icons/obj/device.dmi'
icon_state = "hand_tele"
item_state = "electronic"
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
@@ -1,8 +1,6 @@
/obj/item/melee/baton/cattleprod/teleprod
name = "teleprod"
desc = "A prod with a bluespace crystal on the end. The crystal doesn't look too fun to touch."
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "teleprod_nocell"
base_icon = "teleprod"
origin_tech = "combat=2;bluespace=4;materials=3"
@@ -8,7 +8,6 @@
item_state = "thurible"
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
flags = CONDUCT
container_type = REFILLABLE
/// Whether or not the thurible can be loaded with harmful chems
@@ -19,7 +19,6 @@
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/crowbar.ogg'
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
@@ -111,7 +110,6 @@
armour_penetration_percentage = 50
origin_tech = "magnets=4;syndicate=5"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
light_power = 2
@@ -288,7 +286,6 @@
sharp = TRUE
no_spin_thrown = TRUE
var/obj/item/grenade/explosive = null
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
needs_permit = TRUE
@@ -367,12 +364,8 @@
/obj/item/spear/grey_tide
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
base_icon_state = "spearglass"
icon_state = "spearglass0"
force_unwielded = 15
force_wielded = 25
throwforce = 20
throw_speed = 4
attack_verb = list("gored")
/obj/item/spear/grey_tide/afterattack__legacy__attackchain(atom/movable/AM, mob/living/user, proximity)
@@ -413,7 +406,6 @@
name = "head on a spear"
desc = "How barbaric."
icon_state = "headspear"
density = FALSE
anchored = TRUE
var/obj/item/organ/external/head/mounted_head = null
var/obj/item/spear/contained_spear = null
@@ -519,7 +511,6 @@
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 30
throw_range = 7
w_class = WEIGHT_CLASS_HUGE
origin_tech = "combat=4;powerstorage=7"
@@ -776,8 +767,6 @@
force = 8
throwforce = 10
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
@@ -11,8 +11,6 @@
force = 7
throwforce = 10
throw_speed = 1
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 70, ACID = 30)
// Built automatically from the corresponding vending machine.
@@ -144,7 +142,6 @@
/obj/item/vending_refill/sustenance
machine_name = "Sustenance Vendor"
icon_state = "refill_snack"
/obj/item/vending_refill/donksoft
machine_name = "Donksoft Toy Vendor"
@@ -7,12 +7,10 @@
icon = 'icons/obj/toy.dmi'
icon_state = "toyhammer"
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 7
throw_range = 15
attack_verb = list("banned")
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
@@ -35,7 +33,6 @@
slot_flags = ITEM_SLOT_BELT
force = 2
throwforce = 1
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -58,9 +55,7 @@
force = 40
throwforce = 10
sharp = TRUE
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
@@ -94,7 +89,6 @@
w_class = WEIGHT_CLASS_BULKY
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
needs_permit = TRUE
@@ -119,7 +113,6 @@
item_state = "harpoon"
force = 20
throwforce = 15
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("jabbed","stabbed","ripped")
/obj/item/wirerod
@@ -130,7 +123,6 @@
flags = CONDUCT
force = 9
throwforce = 10
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=1150, MAT_GLASS=75)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
@@ -184,7 +176,6 @@
desc = "A one-handed spear brought over from the Kidan homeworld."
icon_state = "kidanspear"
item_state = "kidanspear"
force = 10
throwforce = 15
/obj/item/melee/baseball_bat