diff --git a/_maps/map_files/MetaStation/MetaStation.v41G.dmm b/_maps/map_files/MetaStation/MetaStation.v41G.dmm index 77d040e7898..6b8a848d759 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41G.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41G.dmm @@ -653,7 +653,7 @@ "amv" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Firing Range"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/security/range) "amw" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 10},/area/security/range) "amx" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/security/range) -"amy" = (/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/structure/closet/crate/secure{desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; req_access_txt = "1"},/obj/machinery/power/apc{cell_type = 2500; dir = 4; name = "Shooting Range APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/range) +"amy" = (/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/clown,/obj/item/target/clown,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/structure/closet/crate/secure{desc = "A secure crate containing various materials for building a customised test-site."; name = "Firing Range Gear Crate"; req_access_txt = "1"},/obj/machinery/power/apc{cell_type = 2500; dir = 4; name = "Shooting Range APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/security/range) "amz" = (/obj/structure/rack,/obj/item/weapon/storage/box/lights/mixed,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/fore) "amA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fore) "amB" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -6868,7 +6868,7 @@ "cBP" = (/turf/simulated/wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBQ" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/machinery/camera{c_tag = "Toxins - Launch Area"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBR" = (/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/toxins/mixing{name = "\improper Toxins Lab"}) -"cBS" = (/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/alien,/obj/item/target/syndicate,/obj/structure/closet/crate/secure{desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; req_access_txt = "8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/toxins/mixing{name = "\improper Toxins Lab"}) +"cBS" = (/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/target,/obj/item/target/syndicate,/obj/item/target/alien,/obj/item/target/clown,/obj/structure/closet/crate/secure{desc = "A secure crate containing various materials for building a customised test-site."; name = "Test Site Materials Crate"; req_access_txt = "8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBT" = (/obj/machinery/doppler_array{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"; dir = 1},/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBU" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE"},/turf/simulated/wall,/area/toxins/mixing{name = "\improper Toxins Lab"}) "cBV" = (/turf/simulated/wall,/area/toxins/test_area) @@ -6903,7 +6903,7 @@ "cCy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "cCz" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "cCA" = (/obj/machinery/power/apc{dir = 4; name = "Mech Bay APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel,/area/assembly/chargebay) -"cCB" = (/obj/structure/rack,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor/engine{dir = 9; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) +"cCB" = (/obj/structure/rack,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/alien,/obj/item/target/clown,/obj/item/target/clown,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor/engine{dir = 9; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cCC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/engine{dir = 1; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cCD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/engine{dir = 5; icon_state = "warning"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) "cCE" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Research Testing Range"; req_access_txt = "0"; req_one_access_txt = "7;47;29"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "purplefull"},/area/toxins/misc_lab{name = "\improper Research Testing Range"}) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index b90216aca52..af5202e011f 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -51393,16 +51393,16 @@ /area/toxins/misc_lab) "bZV" = ( /obj/structure/closet/crate, +/obj/item/target/syndicate, /obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/alien, +/obj/item/target/clown, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "bZW" = ( /obj/structure/closet/crate, /obj/item/target/syndicate, -/obj/item/target/syndicate, -/obj/item/target/syndicate, +/obj/item/target/alien, +/obj/item/target/clown, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "bZX" = ( diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 436725a4baf..1d76aa2bfbe 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -12,7 +12,7 @@ var/last_pressure_delta = 0 - anchored = 1.0 + anchored = 1 density = 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm index 83739c0e13b..59994128b55 100644 --- a/code/ATMOSPHERICS/components/unary_devices/Freezer.dm +++ b/code/ATMOSPHERICS/components/unary_devices/Freezer.dm @@ -4,7 +4,7 @@ icon_state = "freezer" density = 1 var/min_temperature = 0 - anchored = 1.0 + anchored = 1 use_power = 1 current_heat_capacity = 1000 @@ -128,7 +128,7 @@ icon_state = "heater" density = 1 var/max_temperature = 0 - anchored = 1.0 + anchored = 1 current_heat_capacity = 1000 diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index cc407460306..5edaa823b99 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/cryogenics.dmi' icon_state = "cell-off" density = 1 - anchored = 1.0 + anchored = 1 layer = 4 var/on = 0 diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index ef86ac33bfc..649f671d82c 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -217,7 +217,7 @@ world // Multiply all alpha values by this float -/icon/proc/ChangeOpacity(opacity = 1.0) +/icon/proc/ChangeOpacity(opacity = 1) MapColors(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,opacity, 0,0,0,0) // Convert to grayscale diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index fe9e8a29e25..216a65b5be3 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -193,21 +193,21 @@ //Turns a direction into text /proc/dir2text(direction) switch(direction) - if(1.0) + if(1) return "north" - if(2.0) + if(2) return "south" - if(4.0) + if(4) return "east" - if(8.0) + if(8) return "west" - if(5.0) + if(5) return "northeast" - if(6.0) + if(6) return "southeast" - if(9.0) + if(9) return "northwest" - if(10.0) + if(10) return "southwest" else return diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 8c70a7825eb..9681dd9b556 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -9,7 +9,7 @@ /obj/screen name = "" icon = 'icons/mob/screen_gen.dmi' - layer = 20.0 + layer = 20 unacidable = 1 var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 33a8ad6e056..ff3ebace2ce 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -67,7 +67,7 @@ var/const/tk_maxrange = 15 icon_state = "2" flags = NOBLUDGEON | ABSTRACT //item_state = null - w_class = 10.0 + w_class = 10 layer = 20 var/last_throw = 0 diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 41d9d3fb05c..9bae03b30a4 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -19,5 +19,4 @@ var/datum/subsystem/mobs/SSmob if(thing) thing:Life(seconds) continue - WARNING("Found a null in the mob list. Removing.") mob_list.Remove(thing) \ No newline at end of file diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 45aab6c2339..f351bd6d9cb 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -370,7 +370,7 @@ var/datum/subsystem/ticker/ticker //Round statistics report var/datum/station_state/end_state = new /datum/station_state() end_state.count() - var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) + var/station_integrity = min(round( 100 * start_state.score(end_state), 0.1), 100) world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f65a339b6a2..116bc8ac19c 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -193,7 +193,7 @@ else if(istype(I, /obj/item/device/radio)) var/obj/item/device/radio/R = I - R.traitor_frequency = 0.0 + R.traitor_frequency = 0 /datum/mind/proc/remove_all_antag() //For the Lazy amongst us. remove_changeling() diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index c21e37113b7..042243045a6 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -46,11 +46,11 @@ return -/obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes +/obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes - Also a lot of fun name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." summon_type = list(/obj/machinery/bot/ed209) summon_amt = 10 range = 3 - newVars = list("emagged" = 2,"name" = "Wizard's Justicebot") \ No newline at end of file + newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam, "declare_arrests" = 0,"name" = "Wizard's Justicebot") \ No newline at end of file diff --git a/code/game/dna.dm b/code/game/dna.dm index 826d8468f9a..f3b97e23a7f 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -508,7 +508,7 @@ var/current_screen = "mainmenu" var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/diskette = null - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 10 active_power_usage = 400 diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm index 7bfcc1cb4bc..725ebf46091 100644 --- a/code/game/gamemodes/abduction/machinery/console.dm +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -28,7 +28,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "console" density = 1 - anchored = 1.0 + anchored = 1 var/obj/item/device/abductor/gizmo/gizmo var/obj/item/clothing/suit/armor/abductor/vest/vest var/obj/machinery/abductor/experiment/experiment diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 7d64d4ed815..78e195f331c 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -1,7 +1,7 @@ /obj/item/weapon/antag_spawner throw_speed = 1 throw_range = 5 - w_class = 1.0 + w_class = 1 var/used = 0 /obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "") diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index aaac82f87df..95b685beb29 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -24,6 +24,7 @@ name = "desk" desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl" icon_state = "tomealtar" + luminosity = 1 /obj/effect/gateway name = "gateway" @@ -32,4 +33,4 @@ icon_state = "hole" density = 1 unacidable = 1 - anchored = 1.0 + anchored = 1 diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index e146e9b349a..090f077b466 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -330,7 +330,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", icon_state ="tome" throw_speed = 2 throw_range = 5 - w_class = 2.0 + w_class = 2 var/notedat = "" var/tomedat = "" var/list/words = list("ire" = "ire", "ego" = "ego", "nahlizet" = "nahlizet", "certum" = "certum", "veri" = "veri", "jatkaa" = "jatkaa", "balaq" = "balaq", "mgar" = "mgar", "karazet" = "karazet", "geeri" = "geeri") @@ -670,7 +670,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", user << "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of." /obj/item/weapon/tome/imbued //admin tome, spawns working runes without waiting - w_class = 2.0 + w_class = 2 var/cultistsonly = 1 attack_self(mob/user as mob) if(src.cultistsonly && !iscultist(usr)) diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index c3ee3bb0c30..62e911426dc 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/machines/dominator.dmi' icon_state = "dominator" density = 1 - anchored = 1.0 + anchored = 1 layer = 3.6 var/maxhealth = 200 var/health = 200 @@ -120,11 +120,11 @@ qdel(src) return switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) healthcheck(120) - if(3.0) + if(3) healthcheck(30) return diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index c09b45d70cd..cc334c45c4b 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -5,7 +5,7 @@ icon_state = "gangtool-white" item_state = "walkietalkie" throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 flags = CONDUCT diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 6c6c06e84c5..0cbded335b7 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -285,13 +285,13 @@ /datum/game_mode/proc/auto_declare_completion_malfunction() if( malf_ai.len || istype(ticker.mode,/datum/game_mode/malfunction) ) var/text = "
The malfunctioning AIs were:" - var/module_text_temp = "
Purchased modules:
" //Added at the end for(var/datum/mind/malf in malf_ai) text += printplayer(malf, 1) if(malf.current) + var/module_text_temp = "
Purchased modules:
" //Added at the end var/mob/living/silicon/ai/AI = malf.current for(var/datum/AI_Module/mod in AI.current_modules) module_text_temp += mod.module_name + "
" - text += module_text_temp + text += module_text_temp world << text return 1 diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 7e14fb75726..0fe9e7cc79b 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -327,7 +327,7 @@ var/bomb_set return /obj/machinery/nuclearbomb/blob_act() - if (timing == -1.0) + if (timing == -1) return else return ..() @@ -407,7 +407,7 @@ This is here to make the tiles around the station mininuke change when it's arme icon = 'icons/obj/items.dmi' icon_state = "nucleardisk" item_state = "card-id" - w_class = 1.0 + w_class = 1 /obj/item/weapon/disk/nuclear/New() ..() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 4f0cf352abd..a16b2946415 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -4,7 +4,7 @@ icon_state = "pinoff" flags = CONDUCT slot_flags = SLOT_BELT - w_class = 2.0 + w_class = 2 item_state = "electronic" throw_speed = 3 throw_range = 7 diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 304fe753788..06a94232ece 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -35,7 +35,7 @@ icon_state = "rift" density = 1 unacidable = 1 - anchored = 1.0 + anchored = 1 var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies var/spawn_amt_left = 20 var/spawn_fast = 0 @@ -508,7 +508,7 @@ var/global/list/multiverse = list() if(!target && possible.len) target = input(user, "Select your victim!", "Voodoo") as null|anything in possible return - + if(user.zone_sel.selecting == "chest") if(link) target = null @@ -517,7 +517,7 @@ var/global/list/multiverse = list() link = null update_targets() return - + if(target && cooldown < world.time) switch(user.zone_sel.selecting) if("mouth") diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index f0d57d5784d..ef90c160dfa 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -8,7 +8,7 @@ icon_state = "syndballoon" item_state = null flags = ABSTRACT | NODROP - w_class = 5.0 + w_class = 5 force = 0 throwforce = 0 throw_range = 0 diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 0f3fe47fac3..e19a6ae1100 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -4,7 +4,7 @@ icon_state = "soulstone" item_state = "electronic" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." - w_class = 1.0 + w_class = 1 slot_flags = SLOT_BELT origin_tech = "bluespace=4;materials=4" var/imprinted = "empty" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 4c0ae25bd27..0af6de2a817 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -407,7 +407,7 @@ icon_state ="book" throw_speed = 2 throw_range = 5 - w_class = 1.0 + w_class = 1 var/uses = 5 var/temp = null var/op = 1 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 0532fc63f3f..92f6bf099ca 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/device.dmi' icon_state = "motion3" layer = 3 - anchored = 1.0 + anchored = 1 var/uses = 20 var/disabled = 1 var/lethal = 0 diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b89c4ef90d9..a3603f2fc04 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -81,9 +81,9 @@ // breathable air according to human/Life() var/list/TLV = list( "oxygen" = new/datum/tlv( 16, 19, 135, 140), // Partial pressure, kpa - "carbon dioxide" = new/datum/tlv(-1.0, -1.0, 5, 10), // Partial pressure, kpa - "plasma" = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa - "other" = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa + "other" = new/datum/tlv(-1, -1, 0.5, 1), // Partial pressure, kpa "pressure" = new/datum/tlv(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.10,ONE_ATMOSPHERE*1.20), /* kpa */ "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K ) @@ -91,25 +91,25 @@ /* // breathable air according to wikipedia "oxygen" = new/datum/tlv( 9, 12, 158, 296), // Partial pressure, kpa - "carbon dioxide" = new/datum/tlv(-1.0,-1.0, 0.5, 1), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1,-1, 0.5, 1), // Partial pressure, kpa */ /obj/machinery/alarm/server //req_access = list(access_rd) //no, let departaments to work together TLV = list( - "oxygen" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // Partial pressure, kpa - "carbon dioxide" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // Partial pressure, kpa - "plasma" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // Partial pressure, kpa - "other" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // Partial pressure, kpa - "pressure" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), /* kpa */ - "temperature" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // K + "oxygen" = new/datum/tlv(-1, -1,-1,-1), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1, -1,-1,-1), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1, -1,-1,-1), // Partial pressure, kpa + "other" = new/datum/tlv(-1, -1,-1,-1), // Partial pressure, kpa + "pressure" = new/datum/tlv(-1, -1,-1,-1), /* kpa */ + "temperature" = new/datum/tlv(-1, -1,-1,-1), // K ) /obj/machinery/alarm/kitchen_cold_room TLV = list( "oxygen" = new/datum/tlv( 16, 19, 135, 140), // Partial pressure, kpa - "carbon dioxide" = new/datum/tlv(-1.0, -1.0, 5, 10), // Partial pressure, kpa - "plasma" = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa - "other" = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa + "other" = new/datum/tlv(-1, -1, 0.5, 1), // Partial pressure, kpa "pressure" = new/datum/tlv(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.50,ONE_ATMOSPHERE*1.60), /* kpa */ "temperature" = new/datum/tlv(200, 210, 273.15, 283.15), // K ) @@ -295,7 +295,7 @@ environment_data += list(list("name" = "Toxins", "value" = environment.toxins / total * 100, "unit" = "%", "danger_level" = plasma_danger)) cur_tlv = TLV["other"] - var/other_moles = 0.0 + var/other_moles = 0 for(var/datum/gas/G in environment.trace_gases) other_moles+=G.moles var/other_danger = cur_tlv.get_danger_level(other_moles*partial_pressure) @@ -454,7 +454,7 @@ if (isnull(newval) || ..() || (locked && !(usr.has_unlimited_silicon_privilege))) return if (newval<0) - tlv.vars[varname] = -1.0 + tlv.vars[varname] = -1 else if (env=="temperature" && newval>5000) tlv.vars[varname] = 5000 else if (env=="pressure" && newval>50*ONE_ATMOSPHERE) @@ -654,7 +654,7 @@ var/plasma_dangerlevel = cur_tlv.get_danger_level(environment.toxins*GET_PP) cur_tlv = TLV["other"] - var/other_moles = 0.0 + var/other_moles = 0 for(var/datum/gas/G in environment.trace_gases) other_moles+=G.moles var/other_dangerlevel = cur_tlv.get_danger_level(other_moles*GET_PP) @@ -843,11 +843,11 @@ FIRE ALARM desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." icon = 'icons/obj/monitors.dmi' icon_state = "fire0" - var/detecting = 1.0 - var/time = 10.0 - var/timing = 0.0 + var/detecting = 1 + var/time = 10 + var/timing = 0 var/lockdownbyai = 0 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 6 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index ae29f1a43e2..cfd7a1cca0f 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/atmos.dmi' icon_state = "yellow" density = 1 - var/health = 100.0 + var/health = 100 var/valve_open = 0 var/release_pressure = ONE_ATMOSPHERE @@ -217,21 +217,21 @@ update_flag /obj/machinery/portable_atmospherics/canister/ex_act(severity, target) switch(severity) - if(1.0) + if(1) if(destroyed || prob(30)) qdel(src) else src.health = 0 healthcheck() return - if(2.0) + if(2) if(destroyed) qdel(src) else src.health -= rand(40, 100) healthcheck() return - if(3.0) + if(3) src.health -= rand(15,40) healthcheck() return diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index b6175ef1c75..3c2b7019529 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/meter.dmi' icon_state = "meterX" var/obj/machinery/atmospherics/pipe/target = null - anchored = 1.0 + anchored = 1 power_channel = ENVIRON var/frequency = 0 var/id diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index e5235f412f4..7472f7c6087 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -8,8 +8,8 @@ icon_state = "autolathe" density = 1 - var/operating = 0.0 - anchored = 1.0 + var/operating = 0 + anchored = 1 var/list/L = list() var/list/LL = list() var/hacked = 0 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index f488793ae12..5a64e5ac3ea 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -10,8 +10,8 @@ var/on = 1 var/health = 0 //do not forget to set health for your bot! var/maxhealth = 0 - var/fire_dam_coeff = 1.0 - var/brute_dam_coeff = 1.0 + var/fire_dam_coeff = 1 + var/brute_dam_coeff = 1 var/open = 0//Maint panel var/locked = 1 var/hacked = 0 //Used to differentiate between being hacked by silicons and emagged by humans. @@ -296,15 +296,15 @@ /obj/machinery/bot/ex_act(severity, target) switch(severity) - if(1.0) + if(1) explode() return - if(2.0) + if(2) health -= rand(5,10)*fire_dam_coeff health -= rand(10,20)*brute_dam_coeff healthcheck() return - if(3.0) + if(3) if (prob(50)) health -= rand(1,5)*fire_dam_coeff health -= rand(1,5)*brute_dam_coeff diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 2cc3150b0ef..00f14c4a61b 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -4,8 +4,8 @@ name = "proxy bucket" icon = 'icons/obj/aibots.dmi' icon_state = "bucket_proxy" - force = 3.0 - throwforce = 5.0 + force = 3 + throwforce = 5 throw_speed = 2 throw_range = 5 w_class = 3. @@ -18,7 +18,7 @@ desc = "A little cleaning robot, he looks so excited!" icon = 'icons/obj/aibots.dmi' icon_state = "cleanbot0" - layer = 5.0 + layer = 5 density = 0 anchored = 0 //weight = 1.0E7 diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 140fc457c41..57378c735e1 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -3,7 +3,7 @@ desc = "A security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "ed2090" - layer = 5.0 + layer = 5 density = 1 anchored = 0 // weight = 1.0E7 diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 1322d1c4bad..7f107e9892b 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -4,11 +4,11 @@ name = "tiles and toolbox" icon = 'icons/obj/aibots.dmi' icon_state = "toolbox_tiles" - force = 3.0 - throwforce = 10.0 + force = 3 + throwforce = 10 throw_speed = 2 throw_range = 5 - w_class = 3.0 + w_class = 3 var/created_name = "Floorbot" /obj/item/weapon/toolbox_tiles_sensor @@ -16,11 +16,11 @@ name = "tiles, toolbox and sensor arrangement" icon = 'icons/obj/aibots.dmi' icon_state = "toolbox_tiles_sensor" - force = 3.0 - throwforce = 10.0 + force = 3 + throwforce = 10 throw_speed = 2 throw_range = 5 - w_class = 3.0 + w_class = 3 var/created_name = "Floorbot" //Floorbot @@ -29,7 +29,7 @@ desc = "A little floor repairing robot, he looks so excited!" icon = 'icons/obj/aibots.dmi' icon_state = "floorbot0" - layer = 5.0 + layer = 5 density = 0 anchored = 0 health = 25 diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index abb240b6827..a7a49945a18 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -8,7 +8,7 @@ desc = "A little medical robot. He looks somewhat underwhelmed." icon = 'icons/obj/aibots.dmi' icon_state = "medibot0" - layer = 5.0 + layer = 5 density = 0 anchored = 0 health = 20 @@ -70,7 +70,7 @@ var/build_step = 0 var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess var/skin = null //Same as medbot, set to tox or ointment for the respective kits. - w_class = 3.0 + w_class = 3 /obj/item/weapon/firstaid_arm_assembly/New() ..() diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index ee609ef42cd..c85a12354b0 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -3,7 +3,7 @@ desc = "A little security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "secbot0" - layer = 5.0 + layer = 5 density = 0 anchored = 0 health = 25 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index c2613b9a80c..e11ebd25a9e 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -54,7 +54,7 @@ icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. item_state = "card-id" - w_class = 1.0 + w_class = 1 var/list/fields = list() var/read_only = 0 //Well,it's still a floppy disk diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index d1b6e806a05..9f3630160d1 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -332,7 +332,7 @@ density = 1 layer = 3.2//Just above doors pressure_resistance = 4*ONE_ATMOSPHERE - anchored = 1.0 + anchored = 1 flags = ON_BORDER @@ -343,11 +343,11 @@ name = "holographic energy sword" desc = "May the force be with you. Sorta" icon_state = "sword0" - force = 3.0 + force = 3 throw_speed = 2 throw_range = 5 throwforce = 0 - w_class = 2.0 + w_class = 2 hitsound = "swing_hit" flags = NOSHIELD var/active = 0 @@ -463,7 +463,7 @@ var/area/currentarea = null var/eventstarted = 0 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 6 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 3724eb13ae4..185a52cd450 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -640,8 +640,8 @@ else if(href_list["sellcrew"]) //sell a crewmember var/sold = remove_crewmember() last_spaceport_action = "You sold your crewmember, [sold]!" - fuel += 15 - food += 15 + fuel += 7 + food += 7 event() else if(href_list["leave_spaceport"]) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8e848de5caa..ea6d9e07dad 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -13,7 +13,7 @@ /obj/item/weapon/circuitboard density = 0 anchored = 0 - w_class = 2.0 + w_class = 2 name = "circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 5cf2ffbd776..8ae89897c73 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -5,7 +5,7 @@ icon_keyboard = "security_key" circuit = /obj/item/weapon/circuitboard/security var/obj/machinery/camera/current = null - var/last_pic = 1.0 + var/last_pic = 1 var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index f220d02a177..d441c91b0af 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -13,8 +13,8 @@ var/time_last_changed_position = 0 circuit = /obj/item/weapon/circuitboard/card var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/modify = null - var/authenticated = 0.0 - var/mode = 0.0 + var/authenticated = 0 + var/mode = 0 var/printing = null var/list/region_access = null var/list/head_subordinates = null diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index e21322eaf7f..9e6944cc3cb 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/computer.dmi' icon_state = "computer" density = 1 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 300 active_power_usage = 300 @@ -41,17 +41,17 @@ qdel(src) return switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(25)) qdel(src) return if (prob(50)) verbs.Cut() set_broken() - if(3.0) + if(3) if (prob(25)) verbs.Cut() set_broken() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 7bfbe2776ac..ca0c579cd38 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -40,7 +40,7 @@ dat = text("Confirm Identity: []
", src, (src.scan ? text("[]", src.scan.name) : "----------")) if(src.authenticated) switch(src.screen) - if(1.0) + if(1) dat += {" Search Records
List Records @@ -51,7 +51,7 @@
Record Maintenance
{Log Out}
"} - if(2.0) + if(2) dat += {"

@@ -101,9 +101,9 @@ // dat += "[R.fields["id"]]: [R.fields["name"]]
" // //Foreach goto(132) dat += text("
Back", src) - if(3.0) + if(3) dat += text("Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack", src, src, src, src) - if(4.0) + if(4) dat += "
" if(active1 in data_core.general) @@ -155,7 +155,7 @@ dat += "" dat += "" dat += "
Medical Record
Print Record
Back
" - if(5.0) + if(5) dat += "
Virus Database
" for(var/Dt in typesof(/datum/disease/)) var/datum/disease/Dis = new Dt(0) @@ -165,7 +165,7 @@ continue dat += "
[Dis.name]" dat += "
Back" - if(6.0) + if(6) dat += "
Medical Robot Monitor
" dat += "Back" dat += "
Medical Robots:" diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 85b3b5f4802..ed568709958 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -5,11 +5,11 @@ icon_keyboard = "security_key" req_access = list(access_brig) circuit = "/obj/item/weapon/circuitboard/prisoner" - var/id = 0.0 + var/id = 0 var/temp = null var/status = 0 var/timeleft = 60 - var/stop = 0.0 + var/stop = 0 var/screen = 0 // 0 - No Access Denied, 1 - Access allowed var/obj/item/weapon/card/id/prisoner/inserted_id circuit = /obj/item/weapon/circuitboard/prisoner diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 384199d95e7..21b7b401754 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -49,7 +49,7 @@ dat = text("Confirm Identity: []
", src, (scan ? text("[]", scan.name) : "----------")) if(authenticated) switch(screen) - if(1.0) + if(1) //body tag start + onload and onkeypress (onkeyup) javascript event calls dat += "" @@ -156,10 +156,10 @@
"} dat += text("Record Maintenance

", src) dat += text("{Log Out}",src) - if(2.0) + if(2) dat += "Records Maintenance
" dat += "
Delete All Records

Back" - if(3.0) + if(3) dat += "Security Record
" if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) if(istype(active1.fields["photo_front"], /obj/item/weapon/photo)) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 7ddd08684d8..2bb54ab86e3 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -3,7 +3,7 @@ desc = "For shuttle control." icon_screen = "shuttle" icon_keyboard = "tech_key" - var/auth_need = 3.0 + var/auth_need = 3 var/list/authorized = list() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 1feb4e3b5e3..7de5be767b8 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -58,10 +58,10 @@ for reference: desc = "This space is blocked off by a wooden barricade." icon = 'icons/obj/structures.dmi' icon_state = "woodenbarricade" - anchored = 1.0 - density = 1.0 - var/health = 100.0 - var/maxhealth = 100.0 + anchored = 1 + density = 1 + var/health = 100 + var/maxhealth = 100 /obj/structure/barricade/wooden/attackby(obj/item/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) @@ -93,11 +93,11 @@ for reference: /obj/structure/barricade/wooden/ex_act(severity, target) switch(severity) - if(1.0) + if(1) visible_message("The barricade is blown apart!") qdel(src) return - if(2.0) + if(2) src.health -= 25 if (src.health <= 0) visible_message("The barricade is blown apart!") @@ -135,12 +135,12 @@ for reference: name = "deployable barrier" desc = "A deployable barrier. Swipe your ID card to lock/unlock it." icon = 'icons/obj/objects.dmi' - anchored = 0.0 - density = 1.0 + anchored = 0 + density = 1 icon_state = "barrier0" - var/health = 100.0 - var/maxhealth = 100.0 - var/locked = 0.0 + var/health = 100 + var/maxhealth = 100 + var/locked = 0 // req_access = list(access_maint_tunnels) /obj/machinery/deployable/barrier/New() @@ -151,14 +151,14 @@ for reference: /obj/machinery/deployable/barrier/attackby(obj/item/weapon/W, mob/user, params) if (W.GetID()) if (src.allowed(user)) - if (src.emagged < 2.0) + if (src.emagged < 2) src.locked = !src.locked src.anchored = !src.anchored src.icon_state = "barrier[src.locked]" - if ((src.locked == 1.0) && (src.emagged < 2.0)) + if ((src.locked == 1) && (src.emagged < 2)) user << "Barrier lock toggled on." return - else if ((src.locked == 0.0) && (src.emagged < 2.0)) + else if ((src.locked == 0) && (src.emagged < 2)) user << "Barrier lock toggled off." return else @@ -213,10 +213,10 @@ for reference: /obj/machinery/deployable/barrier/ex_act(severity) switch(severity) - if(1.0) + if(1) src.explode() return - if(2.0) + if(2) src.health -= 25 if (src.health <= 0) src.explode() diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index c9a24cb6b5d..b2c140555e1 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -19,7 +19,7 @@ icon_state = "frame" desc = "A remote control for a door." req_access = list(access_brig) - anchored = 1.0 // can't pick it up + anchored = 1 // can't pick it up density = 0 // can walk through it. var/id = null // id of door it controls. var/releasetime = 0 // when world.time reaches it - release the prisoneer diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c1836108462..181eb7923f4 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -91,14 +91,14 @@ //"BLAST" doors are obviously stronger than regular doors when it comes to BLASTS. /obj/machinery/door/poddoor/ex_act(severity, target) switch(severity) - if(1.0) + if(1) if(prob(80)) qdel(src) else var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - if(2.0) + if(2) if(prob(20)) qdel(src) else @@ -106,7 +106,7 @@ s.set_up(2, 1, src) s.start() - if(3.0) + if(3) if(prob(80)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 1e91c882e0d..45d6b6e64be 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/doors/windoor.dmi' icon_state = "left" var/base_state = "left" - var/health = 150.0 //If you change this, consider changing ../door/window/brigdoor/ health at the bottom of this .dm file - visible = 0.0 + var/health = 150 //If you change this, consider changing ../door/window/brigdoor/ health at the bottom of this .dm file + visible = 0 flags = ON_BORDER opacity = 0 var/obj/item/weapon/electronics/airlock/electronics = null @@ -167,14 +167,14 @@ /obj/machinery/door/window/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if(prob(25)) qdel(src) else take_damage(120) - if(3.0) + if(3) take_damage(60) @@ -378,7 +378,7 @@ icon_state = "leftsecure" base_state = "leftsecure" var/id = null - health = 300.0 //Stronger doors for prison (regular window door health is 200) + health = 300 //Stronger doors for prison (regular window door health is 200) reinf = 1 explosion_block = 1 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 56677d12e88..8ed6035d818 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -220,12 +220,12 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ //Destruction procs. /obj/machinery/hologram/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if (prob(50)) qdel(src) - if(3.0) + if(3) if (prob(5)) qdel(src) return diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 2f2b577b889..9920a4f5de7 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "igniter1" var/id = null - var/on = 1.0 - anchored = 1.0 + var/on = 1 + anchored = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 4 diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index ea104d8a86d..2383172069b 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -5,7 +5,7 @@ name = "light switch" icon = 'icons/obj/power.dmi' icon_state = "light1" - anchored = 1.0 + anchored = 1 var/on = 1 var/area/area = null var/otherarea = null diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 8a03f65b1d9..a0b8b57f938 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -204,7 +204,7 @@ icon = 'icons/obj/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING! icon_state = "airlock_control_standby" density = 0 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 45 var/frequency = 1449 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index ac06d67bf1e..aff5298ca5f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -248,9 +248,9 @@ var/list/obj/machinery/newscaster/allCasters = list() /obj/machinery/newscaster/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) isbroken=1 if(prob(50)) qdel(src) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 46a2144fddc..749d167bc3a 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -110,7 +110,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 - anchored = 1.0 + anchored = 1 /* //Allow you to push disposal pipes into it (for those with density 1) @@ -186,7 +186,7 @@ Nah icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 - anchored = 1.0 + anchored = 1 /obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(mob/user) if(..()) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index ad5c467857b..c0571ef5a20 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -13,7 +13,7 @@ /obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/stack/sheet/metal)) - if (src.metal_amount < 150000.0) + if (src.metal_amount < 150000) var/count = 0 src.overlays += "fab-load-metal" spawn(15) @@ -21,7 +21,7 @@ if(!O:amount) return while(metal_amount < 150000 && O:amount) - src.metal_amount += O:materials[MAT_METAL] /*O:height * O:width * O:length * 100000.0*/ + src.metal_amount += O:materials[MAT_METAL] /*O:height * O:width * O:length * 100000*/ O:amount-- count++ diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 033219ce433..f9c4c171f3b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -66,13 +66,13 @@ /obj/machinery/shield/ex_act(severity, target) switch(severity) - if(1.0) + if(1) if (prob(75)) qdel(src) - if(2.0) + if(2) if (prob(50)) qdel(src) - if(3.0) + if(3) if (prob(25)) qdel(src) return @@ -182,15 +182,15 @@ /obj/machinery/shieldgen/ex_act(severity, target) switch(severity) - if(1.0) + if(1) src.health -= 75 src.checkhp() - if(2.0) + if(2) src.health -= 30 if (prob(15)) src.malfunction = 1 src.checkhp() - if(3.0) + if(3) src.health -= 10 src.checkhp() return @@ -570,21 +570,21 @@ if(needs_power) var/obj/machinery/shieldwallgen/G switch(severity) - if(1.0) //big boom + if(1) //big boom if(prob(50)) G = gen_primary else G = gen_secondary G.storedpower -= 200 - if(2.0) //medium boom + if(2) //medium boom if(prob(50)) G = gen_primary else G = gen_secondary G.storedpower -= 50 - if(3.0) //lil boom + if(3) //lil boom if(prob(50)) G = gen_primary else diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e7ab6fc6daf..f532b5a57f5 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -14,15 +14,15 @@ var/mob/living/OCCUPANT = null var/obj/item/clothing/suit/space/SUIT = null var/obj/item/clothing/head/helmet/space/HELMET = null - var/obj/item/clothing/mask/MASK = null + var/obj/item/clothing/mask/MASK = null var/obj/item/STORAGE = null - + //Base types on creation var/SUIT_TYPE = null var/HELMET_TYPE = null var/MASK_TYPE = null var/STORAGE_TYPE = null - + //Machine related vars var/isopen = 0 var/islocked = 0 @@ -147,12 +147,12 @@ /obj/machinery/suit_storage_unit/ex_act(severity, target) switch(severity) - if(1.0) + if(1) if(prob(50)) src.dump_everything() //So suits dont survive all the time qdel(src) return - if(2.0) + if(2) if(prob(50)) src.dump_everything() qdel(src) @@ -258,7 +258,7 @@ /obj/machinery/suit_storage_unit/proc/toggleUV(mob/user) if(!src.panelopen) return - + else if(src.issuperUV) user << "You slide the dial back towards \"185nm\"." diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index b72707db1f2..120a797fbae 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -180,7 +180,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "bombcore" item_state = "eshield0" - w_class = 3.0 + w_class = 3 origin_tech = "syndicate=6;combat=5" var/adminlog = null @@ -296,7 +296,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "bigred" item_state = "electronic" - w_class = 1.0 + w_class = 1 origin_tech = "syndicate=2" var/cooldown = 0 var/detonated = 0 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 0f1d2a3a154..1cbf53376ea 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -238,7 +238,7 @@ name = "teleport" icon = 'icons/obj/stationobjs.dmi' density = 1 - anchored = 1.0 + anchored = 1 /obj/machinery/teleport/hub name = "teleporter hub" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 212fb8b403b..8eaab61fe7a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -644,7 +644,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater = 15, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 10, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 12) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 12) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/mug/tea = 12) vend_delay = 15 product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" @@ -664,7 +664,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "coffee" icon_vend = "coffee-vend" vend_delay = 34 - products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) + products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/mug/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/mug/coco = 25) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 12) refill_canister = /obj/item/weapon/vending_refill/coffee diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 93d94804165..f73c58acdd7 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_10" density = 1 - anchored = 1.0 + anchored = 1 var/state = 1 //1 = empty, open door //2 = empty, closed door diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index b379692d619..44d23eec3bb 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -146,15 +146,15 @@ severity++ log_append_to_last("Armor saved, changing severity to [severity].") switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if (prob(30)) qdel(src) else take_damage(initial(src.health)/2) check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1) - if(3.0) + if(3) if (prob(5)) qdel(src) else diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 3847a564287..3a61c4f108b 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -324,8 +324,8 @@ item_state = "electronic" board_type = "other" flags = CONDUCT - force = 5.0 - w_class = 2.0 + force = 5 + w_class = 2 throwforce = 0 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 256f7b30e7a..e046056abc7 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -84,11 +84,11 @@ /obj/structure/alien/resin/ex_act(severity, target) switch(severity) - if(1.0) + if(1) health -= 150 - if(2.0) + if(2) health -= 100 - if(3.0) + if(3) health -= 50 healthcheck() @@ -218,7 +218,7 @@ else visible_message("[user] has attacked [src] with [I]!") - var/damage = I.force / 4.0 + var/damage = I.force / 4 if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = I if(WT.remove_fuel(0, user)) diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 30f2be1dd2d..02c2a389a4b 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -9,7 +9,7 @@ /obj/effect/effect/ion_trails name = "ion trails" icon_state = "ion_trails" - anchored = 1.0 + anchored = 1 /datum/effect/effect/system/ion_trail_follow var/turf/oldposition diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index 2c7e6e9d6d1..e67971ed6a9 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -8,8 +8,8 @@ /obj/effect/effect/sparks name = "sparks" icon_state = "sparks" - var/amount = 6.0 - anchored = 1.0 + var/amount = 6 + anchored = 1 mouse_opacity = 0 /obj/effect/effect/sparks/New() diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 1f860327ceb..74b8835ec21 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -4,7 +4,7 @@ name = "water" icon = 'icons/effects/effects.dmi' icon_state = "extinguish" - var/life = 15.0 + var/life = 15 mouse_opacity = 0 diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index fa39e40ca87..98177d53658 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -3,7 +3,7 @@ name = "FORCEWALL" icon = 'icons/effects/effects.dmi' icon_state = "m_shield" - anchored = 1.0 + anchored = 1 opacity = 0 density = 1 unacidable = 1 diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 40f10b06059..cabf8231c62 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -119,14 +119,14 @@ /obj/effect/glowshroom/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(50)) qdel(src) return - if(3.0) + if(3) if (prob(5)) qdel(src) return diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 61dbc90fc88..4d63018ae97 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -2,7 +2,7 @@ name = "landmark" icon = 'icons/mob/screen_gen.dmi' icon_state = "x2" - anchored = 1.0 + anchored = 1 unacidable = 1 /obj/effect/landmark/New() @@ -72,7 +72,7 @@ name = "start" icon = 'icons/mob/screen_gen.dmi' icon_state = "x" - anchored = 1.0 + anchored = 1 /obj/effect/landmark/start/New() ..() diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 780c9a58ab8..878c378a237 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -7,7 +7,7 @@ unacidable = 1//Can't destroy energy portals. var/obj/item/target = null var/creator = null - anchored = 1.0 + anchored = 1 var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent /obj/effect/portal/Bumped(mob/M as mob|obj) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 2cabf80db63..3e03cb2b2e3 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -10,12 +10,12 @@ //similar to weeds, but only barfed out by nurses manually /obj/effect/spider/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if (prob(50)) qdel(src) - if(3.0) + if(3) if (prob(5)) qdel(src) return @@ -26,7 +26,7 @@ else visible_message("[user] has attacked \the [src] with \the [W]!") - var/damage = W.force / 4.0 + var/damage = W.force / 4 if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9ae436fb685..c29ac5e4c88 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -13,7 +13,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s var/hitsound = null var/throwhitsound = null - var/w_class = 3.0 + var/w_class = 3 var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE pressure_resistance = 3 @@ -138,17 +138,17 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s ..() var/size switch(src.w_class) - if(1.0) + if(1) size = "tiny" - if(2.0) + if(2) size = "small" - if(3.0) + if(3) size = "normal-sized" - if(4.0) + if(4) size = "bulky" - if(5.0) + if(5) size = "huge" - if(6.0) + if(6) size = "gigantic" else //if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking" diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ce5a102d2fd..f972e37340d 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -91,7 +91,7 @@ desc = "A box of crayons for all your rune drawing needs." icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" - w_class = 2.0 + w_class = 2 storage_slots = 6 can_hold = list( /obj/item/toy/crayon diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f012afd839e..db15fd55ff8 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon = 'icons/obj/pda.dmi' icon_state = "pda" item_state = "electronic" - w_class = 1.0 + w_class = 1 slot_flags = SLOT_ID | SLOT_BELT //Main variables diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index e5604c37591..593249e2214 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -20,7 +20,7 @@ /obj/item/radio/integrated/signal var/frequency = 1457 - var/code = 30.0 + var/code = 30 var/last_transmission var/datum/radio_frequency/radio_connection diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index f153f50e84d..13cd84b0461 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/aicards.dmi' icon_state = "aicard" // aicard-full item_state = "electronic" - w_class = 2.0 + w_class = 2 slot_flags = SLOT_BELT flags = NOBLUDGEON var/flush = null diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index b6b36f429e9..47110eda627 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -10,7 +10,7 @@ desc = "For illicit snooping through the camera network." icon = 'icons/obj/device.dmi' icon_state = "camera_bug" - w_class = 1.0 + w_class = 1 item_state = "camera_bug" throw_speed = 4 throw_range = 20 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 35f05d0f670..91a9da0d1b8 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -4,10 +4,10 @@ flags = CONDUCT slot_flags = SLOT_BELT item_state = "electronic" - throwforce = 5.0 + throwforce = 5 throw_speed = 3 throw_range = 5 - w_class = 2.0 + w_class = 2 origin_tech = "syndicate=4;magnets=4" var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 79533508619..bfc16020b5a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -191,7 +191,7 @@ obj/item/device/flashlight/lamp/bananalamp /obj/item/device/flashlight/flare name = "flare" desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." - w_class = 2.0 + w_class = 2 brightness_on = 7 // Pretty bright. icon_state = "flare" item_state = "flare" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index cda6bef97a8..bd2ae7268f6 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -8,8 +8,8 @@ name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." icon_state = "multitool" - force = 5.0 - w_class = 2.0 + force = 5 + w_class = 2 throwforce = 0 throw_range = 7 throw_speed = 3 diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 719b6491e62..c1c9cd67470 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/aicards.dmi' icon_state = "pai" item_state = "electronic" - w_class = 2.0 + w_class = 2 slot_flags = SLOT_BELT origin_tech = "programming=2" var/obj/item/device/radio/radio diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 5d182e268ab..df275889727 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -5,7 +5,7 @@ name = "power sink" icon_state = "powersink0" item_state = "electronic" - w_class = 4.0 + w_class = 4 flags = CONDUCT throwforce = 5 throw_speed = 1 diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index ae2ab00c9ef..068c9c4b905 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -6,7 +6,7 @@ item_state = "electropack" flags = CONDUCT slot_flags = SLOT_BACK - w_class = 5.0 + w_class = 5 materials = list(MAT_METAL=10000, MAT_GLASS=2500) var/on = 1 var/code = 2 diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 42db3559b3c..55c4ae39336 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -3,7 +3,7 @@ desc = "Talk through this." icon_state = "intercom" anchored = 1 - w_class = 4.0 + w_class = 4 canhear_range = 2 var/number = 0 var/anyai = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c4f2a7190e5..a80e0d4eb31 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -70,7 +70,7 @@ MASS SPECTROMETER flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=200) @@ -235,7 +235,7 @@ MASS SPECTROMETER name = "analyzer" icon_state = "atmos" item_state = "analyzer" - w_class = 2.0 + w_class = 2 flags = CONDUCT slot_flags = SLOT_BELT throwforce = 0 @@ -301,7 +301,7 @@ MASS SPECTROMETER name = "mass-spectrometer" icon_state = "spectrometer" item_state = "analyzer" - w_class = 2.0 + w_class = 2 flags = CONDUCT | OPENCONTAINER slot_flags = SLOT_BELT throwforce = 0 @@ -376,7 +376,7 @@ MASS SPECTROMETER icon_state = "adv_spectrometer" item_state = "analyzer" origin_tech = "biotech=1" - w_class = 2.0 + w_class = 2 flags = CONDUCT throwforce = 0 throw_speed = 3 diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index 2b27a7c3214..dd4b28abfd3 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -3,7 +3,7 @@ desc = "A miniature machine that tracks suit sensors across the station." icon = 'icons/obj/device.dmi' icon_state = "scanner" - w_class = 2.0 + w_class = 2 slot_flags = SLOT_BELT origin_tech = "programming=3;materials=3;magnets=3" diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 65fd7ad4ef2..f77c8951f4f 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -20,7 +20,7 @@ effective or pretty fucking useless. desc = "A strange device with twin antennas." icon_state = "batterer" throwforce = 5 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 flags = CONDUCT @@ -77,7 +77,7 @@ effective or pretty fucking useless. flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=400) diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index b0761167d4e..f76a4942195 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -5,7 +5,7 @@ icon_state = "docs_generic" item_state = "paper" throwforce = 0 - w_class = 1.0 + w_class = 1 throw_range = 1 throw_speed = 1 layer = 4 diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index b663b3a655b..79014837674 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -5,7 +5,7 @@ /obj/item/tapeproj icon = 'icons/obj/holotape.dmi' icon_state = "rollstart" - w_class = 2.0 + w_class = 2 var/turf/start var/turf/end var/tape_type = /obj/item/holotape diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 80ef75d797d..ca3279d8ab8 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -5,7 +5,7 @@ item_state = "lgloves" force = 0 throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 1 throw_range = 7 var/state diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 7e917325b84..19e1d8bc636 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -30,7 +30,7 @@ name = "cyborg torso" desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell." icon_state = "chest" - var/wires = 0.0 + var/wires = 0 var/obj/item/weapon/stock_parts/cell/cell = null /obj/item/robot_parts/head @@ -321,7 +321,7 @@ return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) - src.wires = 1.0 + src.wires = 1 user << "You insert the wire." else user << "You need one length of coil to wire it!" diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 093911ca768..25494f1e90a 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -47,9 +47,18 @@ desc = "A shooting target that looks like a xenomorphic alien." hp = 2350 +/obj/item/target/clown + icon_state = "target_c" + desc = "A shooting target that looks like a useless clown." + hp = 2000 + #define DECALTYPE_SCORCH 1 #define DECALTYPE_BULLET 2 +/obj/item/target/clown/bullet_act(obj/item/projectile/P) + ..() + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + /obj/item/target/bullet_act(obj/item/projectile/P) var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!" var/p_y = P.p_y + pick(0,0,0,0,0,-1,1) diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm index eff17423b61..0bc3ee71dec 100644 --- a/code/game/objects/items/stacks/cash.dm +++ b/code/game/objects/items/stacks/cash.dm @@ -9,7 +9,7 @@ throwforce = 0 throw_speed = 2 throw_range = 2 - w_class = 1.0 + w_class = 1 burn_state = 0 //Burnable /obj/item/stack/spacecash/c10 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 790815844be..db1e1312ac7 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -10,9 +10,9 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ icon_state = "rods" item_state = "rods" flags = CONDUCT - w_class = 3.0 - force = 9.0 - throwforce = 10.0 + w_class = 3 + force = 9 + throwforce = 10 throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=1000) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 241ddea4362..ea30f89c7b5 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -260,9 +260,9 @@ desc = "A nasty looking shard of glass." icon = 'icons/obj/shards.dmi' icon_state = "large" - w_class = 1.0 - force = 5.0 - throwforce = 10.0 + w_class = 1 + force = 5 + throwforce = 10 item_state = "shard-glass" materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) attack_verb = list("stabbed", "slashed", "sliced", "cut") diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index eaae918b9b5..7d9053420d6 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -3,9 +3,9 @@ singular_name = "wired glass floor tile" desc = "A glass tile, which is wired, somehow." icon_state = "glass_wire" - w_class = 3.0 - force = 3.0 - throwforce = 5.0 + w_class = 3 + force = 3 + throwforce = 5 throw_speed = 3 throw_range = 7 flags = CONDUCT diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 29f5b76047a..d41a8d295a8 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -52,9 +52,9 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ name = "diamond" icon_state = "sheet-diamond" singular_name = "diamond" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_range = 3 origin_tech = "materials=6" sheettype = "diamond" @@ -81,9 +81,9 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ name = "uranium" icon_state = "sheet-uranium" singular_name = "uranium sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=5" @@ -110,9 +110,9 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ name = "solid plasma" icon_state = "sheet-plasma" singular_name = "plasma sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "plasmatech=2;materials=2" @@ -152,9 +152,9 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ name = "gold" icon_state = "sheet-gold" singular_name = "gold bar" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=4" @@ -184,9 +184,9 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ name = "silver" icon_state = "sheet-silver" singular_name = "silver bar" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=3" @@ -216,9 +216,9 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ name = "bananium" icon_state = "sheet-clown" singular_name = "bananium sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=4" @@ -246,9 +246,9 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ name = "enriched uranium" icon_state = "sheet-enruranium" singular_name = "enriched uranium sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=5" @@ -260,9 +260,9 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ name = "adamantine" icon_state = "sheet-adamantine" singular_name = "adamantine sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=4" @@ -274,9 +274,9 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ name = "mythril" icon_state = "sheet-mythril" singular_name = "mythril sheet" - force = 5.0 + force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 1 throw_range = 3 origin_tech = "materials=4" \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 506602fb560..269822a24a6 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -50,7 +50,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ singular_name = "metal sheet" icon_state = "sheet-metal" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) - throwforce = 10.0 + throwforce = 10 flags = CONDUCT origin_tech = "materials=1" @@ -78,7 +78,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ icon_state = "sheet-plasteel" item_state = "sheet-metal" materials = list(MAT_METAL=6000, MAT_PLASMA=6000) - throwforce = 10.0 + throwforce = 10 flags = CONDUCT origin_tech = "materials=2" diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 35d3ae089ce..7cc6543d100 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -1,6 +1,6 @@ /obj/item/stack/sheet name = "sheet" - w_class = 3.0 + w_class = 3 force = 5 throwforce = 5 max_amount = 50 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index d1280070106..8b92a76ebe4 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -3,9 +3,9 @@ singular_name = "broken tile" desc = "A broken tile. This should not exist." icon = 'icons/obj/tiles.dmi' - w_class = 3.0 - force = 1.0 - throwforce = 1.0 + w_class = 3 + force = 1 + throwforce = 1 throw_speed = 3 throw_range = 7 max_amount = 60 @@ -121,9 +121,9 @@ singular_name = "floor tile" desc = "Those could work as a pretty decent throwing weapon." icon_state = "tile" - force = 6.0 + force = 6 materials = list(MAT_METAL=500) - throwforce = 10.0 + throwforce = 10 flags = CONDUCT max_amount = 60 turf_type = /turf/simulated/floor/plasteel diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1944785dafa..707393427bf 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -98,7 +98,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = "syndballoon" - w_class = 4.0 + w_class = 4 /* * Fake singularity @@ -122,10 +122,10 @@ righthand_file = 'icons/mob/inhands/guns_righthand.dmi' flags = CONDUCT slot_flags = SLOT_BELT - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=10, MAT_GLASS=10) attack_verb = list("struck", "pistol whipped", "hit", "bashed") - var/bullets = 7.0 + var/bullets = 7 /obj/item/toy/gun/examine(mob/user) ..() @@ -174,9 +174,9 @@ desc = "Make sure to recyle the box in an autolathe when it gets empty." icon = 'icons/obj/ammo.dmi' icon_state = "357OLD-7" - w_class = 1.0 + w_class = 1 materials = list(MAT_METAL=10, MAT_GLASS=10) - var/amount_left = 7.0 + var/amount_left = 7 /obj/item/toy/ammo/gun/update_icon() src.icon_state = text("357OLD-[]", src.amount_left) @@ -194,8 +194,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "sword0" item_state = "sword0" - var/active = 0.0 - w_class = 2.0 + var/active = 0 + w_class = 2 flags = NOSHIELD attack_verb = list("attacked", "struck", "hit") var/hacked = 0 @@ -316,7 +316,7 @@ desc = "A colourful crayon. Looks tasty. Mmmm..." icon = 'icons/obj/crayons.dmi' icon_state = "crayonred" - w_class = 1.0 + w_class = 1 attack_verb = list("attacked", "coloured") var/colour = "#FF0000" //RGB var/drawtype = "rune" @@ -645,7 +645,7 @@ desc = "A little toy model AI core with real law announcing action!" icon = 'icons/obj/toy.dmi' icon_state = "AI" - w_class = 2.0 + w_class = 2 var/cooldown = 0 /obj/item/toy/AI/attack_self(mob/user) @@ -664,7 +664,7 @@ desc = "An action figure modeled after 'The Owl', defender of justice." icon = 'icons/obj/toy.dmi' icon_state = "owlprize" - w_class = 2.0 + w_class = 2 var/cooldown = 0 /obj/item/toy/owl/attack_self(mob/user) @@ -683,7 +683,7 @@ desc = "An action figure modeled after 'The Griffin', criminal mastermind." icon = 'icons/obj/toy.dmi' icon_state = "griffinprize" - w_class = 2.0 + w_class = 2 var/cooldown = 0 /obj/item/toy/griffin/attack_self(mob/user) @@ -729,7 +729,7 @@ icon = 'icons/obj/toy.dmi' deckstyle = "nanotrasen" icon_state = "deck_nanotrasen_full" - w_class = 2.0 + w_class = 2 var/cooldown = 0 var/list/cards = list() @@ -860,7 +860,7 @@ desc = "A number of cards not in a deck, customarily held in ones hand." icon = 'icons/obj/toy.dmi' icon_state = "nanotrasen_hand2" - w_class = 1.0 + w_class = 1 var/list/currenthand = list() var/choice = null @@ -954,7 +954,7 @@ desc = "a card" icon = 'icons/obj/toy.dmi' icon_state = "singlecard_nanotrasen_down" - w_class = 1.0 + w_class = 1 var/cardname = null var/flipped = 0 pixel_x = -5 @@ -1074,7 +1074,7 @@ desc = "A plastic model of a Nuclear Fission Explosive." icon = 'icons/obj/toy.dmi' icon_state = "nuketoyidle" - w_class = 2.0 + w_class = 2 var/cooldown = 0 /obj/item/toy/nuke/attack_self(mob/user) @@ -1101,7 +1101,7 @@ desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor?" icon = 'icons/obj/toy.dmi' icon_state = "minimeteor" - w_class = 2.0 + w_class = 2 /obj/item/toy/minimeteor/throw_impact(atom/hit_atom) if(!..()) @@ -1120,7 +1120,7 @@ desc = "An adorable stuffed toy that resembles a space carp." icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" - w_class = 2.0 + w_class = 2 attack_verb = list("bitten", "eaten", "fin slapped") burn_state = 0 //Burnable var/bitesound = 'sound/weapons/bite.ogg' @@ -1144,7 +1144,7 @@ desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back." icon = 'icons/obj/assemblies.dmi' icon_state = "bigred" - w_class = 2.0 + w_class = 2 var/cooldown = 0 /obj/item/toy/redbutton/attack_self(mob/user) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 12e705d193b..d6283f29982 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -2,7 +2,7 @@ /obj/item/trash icon = 'icons/obj/janitor.dmi' desc = "This is rubbish." - w_class = 1.0 + w_class = 1 burn_state = 0 //Burnable /obj/item/trash/raisins diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 1314d9ad563..a889ae340ab 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -13,8 +13,8 @@ AI MODULES item_state = "electronic" desc = "An AI Module for programming laws to an AI." flags = CONDUCT - force = 5.0 - w_class = 2.0 + force = 5 + w_class = 2 throwforce = 0 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 5fa372b2212..f60b7d58c09 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -11,13 +11,13 @@ RCD icon_state = "rcd" opacity = 0 density = 0 - anchored = 0.0 + anchored = 0 flags = CONDUCT - force = 10.0 - throwforce = 10.0 + force = 10 + throwforce = 10 throw_speed = 3 throw_range = 5 - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=100000) origin_tech = "engineering=4;materials=2" req_access_txt = "11" diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index c747d60f4b8..4da668c252d 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -125,13 +125,13 @@ var/global/list/RPD_recipes=list( icon_state = "rpd" opacity = 0 density = 0 - anchored = 0.0 + anchored = 0 flags = CONDUCT - force = 10.0 - throwforce = 10.0 + force = 10 + throwforce = 10 throw_speed = 1 throw_range = 5 - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=75000, MAT_GLASS=37500) origin_tech = "engineering=4;materials=2" var/datum/effect/effect/system/spark_spread/spark_system diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 12bdb352692..ab52b794c19 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -10,10 +10,10 @@ RSF icon_state = "rcd" opacity = 0 density = 0 - anchored = 0.0 + anchored = 0 var/matter = 0 var/mode = 1 - w_class = 3.0 + w_class = 3 /obj/item/weapon/rsf/New() desc = "A RSF. It currently holds [matter]/30 fabrication-units." diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 7e97b395fff..a67c67dd615 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -5,7 +5,7 @@ icon_state = "paint sprayer" item_state = "paint sprayer" - w_class = 2.0 + w_class = 2 materials = list(MAT_METAL=50, MAT_GLASS=50) origin_tech = "engineering=1" diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index f1c7722dd53..7ff548f6db8 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -15,7 +15,7 @@ name = "card" desc = "Does card things." icon = 'icons/obj/card.dmi' - w_class = 1.0 + w_class = 1 var/list/files = list( ) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index c46f1131447..7266fcf1bc0 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/chronos.dmi' icon_state = "chronobackpack" item_state = "backpack" - w_class = 4.0 + w_class = 4 slot_flags = SLOT_BACK slowdown = 1 action_button_name = "Equip/Unequip TED Gun" @@ -41,7 +41,7 @@ icon = 'icons/obj/chronos.dmi' icon_state = "chronogun" item_state = "chronogun" - w_class = 3.0 + w_class = 3 flags = NODROP ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam) fire_delay = 50 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 6cb5747539f..1784e7edd31 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -22,7 +22,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "match_unlit" var/lit = 0 var/smoketime = 5 - w_class = 1.0 + w_class = 1 origin_tech = "materials=1" /obj/item/weapon/match/process() @@ -272,8 +272,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/rollie/New() ..() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) /obj/item/clothing/mask/cigarette/rollie/trippy/New() ..() @@ -289,8 +289,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/cigbutt/roach/New() ..() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) //////////// diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index e7415d55fd1..c9493e5d8e0 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -15,7 +15,7 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "soap" - w_class = 1.0 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 7 @@ -83,7 +83,7 @@ item_state = "bike_horn" throwforce = 0 hitsound = null //To prevent tap.ogg playing, as the item lacks of force - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 attack_verb = list("HONKED") diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 408cbe25a01..1e670b2461f 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -7,9 +7,9 @@ desc = "Order, order! No bombs in my courthouse." icon = 'icons/obj/items.dmi' icon_state = "gavelhammer" - force = 5.0 - throwforce = 6.0 - w_class = 2.0 + force = 5 + throwforce = 6 + w_class = 2 attack_verb = list("bashed", "battered", "judged", "whacked") burn_state = 0 //Burnable @@ -23,9 +23,9 @@ 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 - w_class = 1.0 + force = 2 + throwforce = 2 + w_class = 1 burn_state = 0 //Burnable /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index aef3ae6a3bc..26a2936a0ac 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -5,7 +5,7 @@ icon_state = "dnainjector" throw_speed = 3 throw_range = 5 - w_class = 1.0 + w_class = 1 var/damage_coeff = 1 var/list/fields diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index fb2e6781181..15f0e21a17d 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -8,7 +8,7 @@ icon_state = "plastic-explosive0" item_state = "plasticx" flags = NOBLUDGEON - w_class = 2.0 + w_class = 2 origin_tech = "syndicate=2" var/datum/wires/explosive/c4/wires = null var/timer = 10 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index c4169a526a6..ffdb5b0031e 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -7,14 +7,14 @@ hitsound = 'sound/weapons/smash.ogg' flags = CONDUCT throwforce = 10 - w_class = 3.0 + w_class = 3 throw_speed = 2 throw_range = 7 force = 10 materials = list(MAT_METAL=90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") var/max_water = 50 - var/last_use = 1.0 + var/last_use = 1 var/safety = 1 var/sprite_name = "fire_extinguisher" var/power = 5 //Maximum distance launched water will travel @@ -29,8 +29,8 @@ hitsound = null //it is much lighter, after all. flags = null //doesn't CONDUCT throwforce = 2 - w_class = 2.0 - force = 3.0 + w_class = 2 + force = 3 materials = list() max_water = 30 sprite_name = "miniFE" diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 9a9971a6199..81b9e649079 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -5,11 +5,11 @@ icon_state = "flamethrowerbase" item_state = "flamethrower_0" flags = CONDUCT - force = 3.0 - throwforce = 10.0 + force = 3 + throwforce = 10 throw_speed = 1 throw_range = 5 - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=500) origin_tech = "combat=1;plasmatech=1" var/status = 0 diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index ddde0ca0426..0d1c1723f68 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -3,7 +3,7 @@ /obj/item/weapon/grenade/iedcasing name = "improvised firebomb" desc = "A weak, improvised incendiary device." - w_class = 2.0 + w_class = 2 icon = 'icons/obj/grenade.dmi' icon_state = "improvised_grenade" item_state = "flashbang" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 9ef1c2b03c6..8f2d272509f 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -1,7 +1,7 @@ /obj/item/weapon/grenade name = "grenade" desc = "It has an adjustable timer." - w_class = 2.0 + w_class = 2 icon = 'icons/obj/grenade.dmi' icon_state = "grenade" item_state = "flashbang" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 20242e9a5f0..1fb6648a806 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -13,7 +13,7 @@ flags = CONDUCT slot_flags = SLOT_BELT throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=500) @@ -152,7 +152,7 @@ icon_state = "handcuff" flags = CONDUCT throwforce = 0 - w_class = 3.0 + w_class = 3 origin_tech = "materials=1" slowdown = 7 breakouttime = 300 //Deciseconds = 30s = 0.5 minute diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 20f83673553..1522d73b8f5 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -85,7 +85,7 @@ desc = "Track with this." activated = 0 origin_tech = "materials=2;magnets=2;programming=2;biotech=2" - var/id = 1.0 + var/id = 1 /obj/item/weapon/implant/tracking/get_data() var/dat = {"Implant Specifications:
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index d6644f1c886..7675b951821 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -6,7 +6,7 @@ item_state = "implantcase" throw_speed = 2 throw_range = 5 - w_class = 1.0 + w_class = 1 origin_tech = "materials=1;biotech=2" materials = list(MAT_GLASS=500) var/obj/item/weapon/implant/imp = null diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 034e31ac510..9b0505df42d 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -6,7 +6,7 @@ item_state = "syringe_0" throw_speed = 3 throw_range = 5 - w_class = 2.0 + w_class = 2 origin_tech = "materials=1;biotech=3;programming=2" materials = list(MAT_METAL=600, MAT_GLASS=200) var/obj/item/weapon/implant/imp = null diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index a3361cfda58..b0a6353d5de 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -6,10 +6,10 @@ item_state = "electronic" throw_speed = 3 throw_range = 5 - w_class = 2.0 + w_class = 2 var/obj/item/weapon/implantcase/case = null var/broadcasting = null - var/listening = 1.0 + var/listening = 1 /obj/item/weapon/implantpad/update_icon() diff --git a/code/game/objects/items/weapons/janisigns.dm b/code/game/objects/items/weapons/janisigns.dm index 48fd898b696..e87e6597cc2 100644 --- a/code/game/objects/items/weapons/janisigns.dm +++ b/code/game/objects/items/weapons/janisigns.dm @@ -55,9 +55,9 @@ name = "wet floor sign" icon = 'icons/obj/janitor.dmi' icon_state = "caution" - force = 1.0 - throwforce = 3.0 + force = 1 + throwforce = 3 throw_speed = 2 throw_range = 5 - w_class = 2.0 + w_class = 2 attack_verb = list("warned", "cautioned", "smashed") diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index cced8bac3d3..510371f094f 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -13,8 +13,8 @@ name = "fork" desc = "Pointy." icon_state = "fork" - force = 5.0 - w_class = 1.0 + force = 5 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 5 @@ -52,9 +52,9 @@ icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." flags = CONDUCT - force = 10.0 - w_class = 2.0 - throwforce = 10.0 + force = 10 + w_class = 2 + throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' throw_speed = 3 throw_range = 6 @@ -73,27 +73,27 @@ desc = "The unearthly energies that once powered this blade are now dormant." icon = 'icons/obj/wizard.dmi' icon_state = "render" - w_class = 3.0 + w_class = 3 /obj/item/weapon/kitchen/knife/butcher 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.0 - throwforce = 8.0 + force = 15 + throwforce = 8 attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - w_class = 3.0 + w_class = 3 /obj/item/weapon/kitchen/rollingpin name = "rolling pin" desc = "Used to knock out the Bartender." icon_state = "rolling_pin" - force = 8.0 - throwforce = 5.0 + force = 8 + throwforce = 5 throw_speed = 3 throw_range = 7 - w_class = 3.0 + w_class = 3 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") /* Trays moved to /obj/item/weapon/storage/bag */ diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 81ac92e29f0..24c9a6de8cb 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -19,7 +19,7 @@ name = "energy axe" desc = "An energised battle axe." icon_state = "axe0" - force = 40.0 + force = 40 force_on = 150 throwforce = 25 throwforce_on = 30 @@ -41,8 +41,8 @@ name = "energy sword" desc = "May the force be within you." icon_state = "sword0" - force = 3.0 - throwforce = 5.0 + force = 3 + throwforce = 5 hitsound = "swing_hit" //it starts deactivated throw_speed = 3 throw_range = 5 @@ -172,7 +172,7 @@ throwforce = 1//Throwing or dropping the item deletes it. throw_speed = 3 throw_range = 1 - w_class = 4.0//So you can't hide it in your pocket or some such. + w_class = 4//So you can't hide it in your pocket or some such. flags = NOSHIELD var/datum/effect/effect/system/spark_spread/spark_system diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 2b4f54b5679..6281c819e06 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -5,11 +5,11 @@ name = "mop" icon = 'icons/obj/janitor.dmi' icon_state = "mop" - force = 3.0 - throwforce = 5.0 + force = 3 + throwforce = 5 throw_speed = 3 throw_range = 7 - w_class = 3.0 + w_class = 3 attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") burn_state = 0 //Burnable var/mopping = 0 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 52a63bbed10..7c4972dcefb 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -9,7 +9,7 @@ icon_state = "paint_neutral" item_color = "FFFFFF" item_state = "paintcan" - w_class = 3.0 + w_class = 3 burn_state = 0 //Burnable burntime = 5 var/paintleft = 10 diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 245b4d0930b..c78c3c0489d 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -3,8 +3,8 @@ desc = "A scroll for moving around." icon = 'icons/obj/wizard.dmi' icon_state = "scroll" - var/uses = 4.0 - w_class = 2.0 + var/uses = 4 + w_class = 2 item_state = "paper" throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm index 6af39f80844..0c55814a6b7 100644 --- a/code/game/objects/items/weapons/signs.dm +++ b/code/game/objects/items/weapons/signs.dm @@ -3,7 +3,7 @@ name = "blank picket sign" desc = "It's blank" force = 5 - w_class = 4.0 + w_class = 4 attack_verb = list("bashed","smacked") burn_state = 0 //Burnable diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ecb03b97266..7c508952c58 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -109,7 +109,7 @@ desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" icon_state = "giftbag0" item_state = "giftbag" - w_class = 4.0 + w_class = 4 max_w_class = 3 max_combined_w_class = 60 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 55ed5b43bad..639a2045d1a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -292,10 +292,10 @@ icon_state = "tray" desc = "A metal tray to lay food on." force = 5 - throwforce = 10.0 + throwforce = 10 throw_speed = 3 throw_range = 5 - w_class = 4.0 + w_class = 4 flags = CONDUCT materials = list(MAT_METAL=3000) preposition = "on" diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 9e494db3126..0272a07c6b8 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -5,7 +5,7 @@ icon_state ="book" throw_speed = 2 throw_range = 5 - w_class = 3.0 + w_class = 3 burn_state = 0 //Burnable var/title = "book" /obj/item/weapon/storage/book/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index b37091113a6..788c5bd7eb2 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -3,11 +3,11 @@ desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" flags = CONDUCT - force = 8.0 + force = 8 hitsound = "swing_hit" throw_speed = 2 throw_range = 4 - w_class = 4.0 + w_class = 4 max_w_class = 3 max_combined_w_class = 21 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 65e2b67e0b3..cde01e150dd 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -134,7 +134,7 @@ icon_state = "pill_canister" icon = 'icons/obj/chemical.dmi' item_state = "contsolid" - w_class = 2.0 + w_class = 2 can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice) allow_quick_gather = 1 use_to_pickup = 1 diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 1f2aa54fff4..181dd0a771a 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -23,7 +23,7 @@ var/l_hacking = 0 var/emagged = 0 var/open = 0 - w_class = 3.0 + w_class = 3 max_w_class = 2 max_combined_w_class = 14 @@ -149,11 +149,11 @@ icon_state = "secure" item_state = "sec-case" desc = "A large briefcase with a digital locking system." - force = 8.0 + force = 8 hitsound = "swing_hit" throw_speed = 2 throw_range = 4 - w_class = 4.0 + w_class = 4 max_w_class = 3 max_combined_w_class = 21 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") @@ -182,7 +182,7 @@ //Syndie variant of Secure Briefcase. Contains space cash, slightly more robust. /obj/item/weapon/storage/secure/briefcase/syndie - force = 15.0 + force = 15 /obj/item/weapon/storage/secure/briefcase/syndie/New() for(var/i = 0, i < storage_slots - 2, i++) @@ -201,10 +201,10 @@ icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" - force = 8.0 - w_class = 8.0 + force = 8 + w_class = 8 max_w_class = 8 - anchored = 1.0 + anchored = 1 density = 0 cant_hold = list(/obj/item/weapon/storage/secure/briefcase) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index bc0a1f2279f..839ad1b8a48 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -8,7 +8,7 @@ /obj/item/weapon/storage name = "storage" icon = 'icons/obj/storage.dmi' - w_class = 3.0 + w_class = 3 var/silent = 0 // No message on putting items in var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else) var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set) @@ -312,7 +312,7 @@ usr << "You put [W] [preposition]to [src]." else if(in_range(M, usr)) //If someone is standing close enough, they can tell what it is... M.show_message("[usr] puts [W] [preposition]to [src].", 1) - else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... + else if(W && W.w_class >= 3) //Otherwise they can only see large or normal items from a distance... M.show_message("[usr] puts [W] [preposition]to [src].", 1) orient2hud(usr) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index edaf38870f1..87f7a91e262 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -2,12 +2,12 @@ name = "jetpack (empty)" desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" - w_class = 4.0 + w_class = 4 item_state = "jetpack" distribute_pressure = ONE_ATMOSPHERE * O2STANDARD action_button_name = "Toggle Jetpack" var/datum/effect/effect/system/ion_trail_follow/ion_trail - var/on = 0.0 + var/on = 0 var/stabilization_on = 0 var/volume_rate = 500 //Needed for borg jetpack transfer diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 1c9227216d2..2a4a9ca3843 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -148,8 +148,8 @@ icon_state = "emergency" flags = CONDUCT slot_flags = SLOT_BELT - w_class = 2.0 - force = 4.0 + w_class = 2 + force = 4 distribute_pressure = ONE_ATMOSPHERE*O2STANDARD volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index c620d777376..f1a9886ae6c 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -10,8 +10,8 @@ pressure_resistance = ONE_ATMOSPHERE*5 - force = 5.0 - throwforce = 10.0 + force = 5 + throwforce = 10 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 638a4a5a2e0..ba97ef8f0a8 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "waterbackpack" item_state = "waterbackpack" - w_class = 4.0 + w_class = 4 slot_flags = SLOT_BACK slowdown = 1 action_button_name = "Toggle Mister" @@ -108,7 +108,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "mister" item_state = "mister" - w_class = 4.0 + w_class = 4 amount_per_transfer_from_this = 50 possible_transfer_amounts = list(25,50,100) volume = 500 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 0a9af02493f..0bf17d4be30 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -15,9 +15,9 @@ var/temp = null var/frequency = 1451 var/broadcasting = null - var/listening = 1.0 + var/listening = 1 flags = CONDUCT - w_class = 2.0 + w_class = 2 item_state = "electronic" throw_speed = 3 throw_range = 7 @@ -129,7 +129,7 @@ Frequency: icon_state = "hand_tele" item_state = "electronic" throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=10000) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index c7a857f059b..49a81c6038d 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -106,10 +106,10 @@ icon_state = "cutters" flags = CONDUCT slot_flags = SLOT_BELT - force = 6.0 + force = 6 throw_speed = 3 throw_range = 7 - w_class = 2.0 + w_class = 2 materials = list(MAT_METAL=80) origin_tech = "materials=1;engineering=1" attack_verb = list("pinched", "nipped") diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index fe8010e74f5..3fd5b7cf096 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -95,7 +95,7 @@ /obj/item/weapon/twohanded/offhand name = "offhand" icon_state = "offhand" - w_class = 5.0 + w_class = 5 flags = ABSTRACT /obj/item/weapon/twohanded/offhand/unwield() @@ -115,7 +115,7 @@ ///////////Two hand required objects/////////////// //This is for objects that require two hands to even pick up /obj/item/weapon/twohanded/required/ - w_class = 5.0 + w_class = 5 /obj/item/weapon/twohanded/required/attack_self() return @@ -150,7 +150,7 @@ desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?" force = 5 throwforce = 15 - w_class = 4.0 + w_class = 4 slot_flags = SLOT_BACK force_unwielded = 5 force_wielded = 24 // Was 18, Buffed - RobRichards/RR @@ -188,10 +188,10 @@ name = "double-bladed energy sword" desc = "Handle with care." force = 3 - throwforce = 5.0 + throwforce = 5 throw_speed = 3 throw_range = 5 - w_class = 2.0 + w_class = 2 force_unwielded = 3 force_wielded = 34 wieldsound = 'sound/weapons/saberon.ogg' @@ -285,7 +285,7 @@ name = "spear" desc = "A haphazardly-constructed yet still deadly weapon of ancient design." force = 10 - w_class = 4.0 + w_class = 4 slot_flags = SLOT_BACK force_unwielded = 10 force_wielded = 18 diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index bc90ffa7c1d..ef6efa237bb 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -6,11 +6,11 @@ icon_state = "refill_snack" item_state = "restock_unit" flags = CONDUCT - force = 7.0 - throwforce = 10.0 + force = 7 + throwforce = 10 throw_speed = 1 throw_range = 7 - w_class = 4.0 + w_class = 4 var/charges = list(0, 0, 0) //how many restocking "charges" the refill has for standard/contraband/coin products var/init_charges = list(0, 0, 0) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index b1ad1b4ea92..85a24a4155d 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -5,7 +5,7 @@ icon_state = "toyhammer" slot_flags = SLOT_BELT throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 attack_verb = list("banned") diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6ec5bc1fa2e..0d301e9123b 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -139,7 +139,7 @@ Loc.on_log() /obj/singularity_act() - ex_act(1.0) + ex_act(1) if(src && isnull(gc_destroyed)) qdel(src) return 2 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 46f83a340af..cdee1cbbac5 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -11,11 +11,11 @@ LINEN BINS icon_state = "sheetwhite" item_state = "bedsheet" slot_flags = SLOT_BACK - layer = 4.0 + layer = 4 throwforce = 0 throw_speed = 1 throw_range = 2 - w_class = 1.0 + w_class = 1 item_color = "white" burn_state = 0 //Burnable diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 572ae4a133a..ccb42613e13 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -3,7 +3,7 @@ desc = "Looks absolutely SHOCKING!" icon_state = "echair0" var/obj/item/assembly/shock_kit/part = null - var/last_time = 1.0 + var/last_time = 1 /obj/structure/stool/bed/chair/e_chair/New() ..() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index e56bcd0a4ee..3f8762bc663 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -11,16 +11,16 @@ /obj/structure/extinguisher_cabinet/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if(prob(50)) if(has_extinguisher) has_extinguisher.loc = src.loc qdel(src) return - if(3.0) + if(3) return diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index ad517849659..6adf446a067 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -49,15 +49,15 @@ /obj/structure/fireaxecabinet/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if(prob(50) && fireaxe) fireaxe.loc = src.loc qdel(src) return - if(3.0) + if(3) return /obj/structure/fireaxecabinet/bullet_act(obj/item/projectile/Proj) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index f1e868a9055..28a1970eb95 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -229,14 +229,14 @@ /obj/structure/girder/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if (prob(70)) var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal) new remains(loc) qdel(src) - if(3.0) + if(3) if (prob(40)) var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal) new remains(loc) @@ -258,14 +258,14 @@ /obj/structure/girder/reinforced/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if (prob(30)) var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal) new remains(loc) qdel(src) - if(3.0) + if(3) if (prob(5)) var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal) new remains(loc) @@ -320,13 +320,13 @@ /obj/structure/cultgirder/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if(prob(30)) new /obj/effect/decal/remains/human(loc) qdel(src) - if(3.0) + if(3) if(prob(5)) new /obj/effect/decal/remains/human(loc) qdel(src) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index c530eda3f80..7ca5f4dd2df 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/structures.dmi' icon_state = "latticefull" density = 0 - anchored = 1.0 + anchored = 1 layer = 2.3 //under pipes var/obj/item/stack/rods/stored // flags = CONDUCT @@ -39,13 +39,13 @@ /obj/structure/lattice/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) qdel(src) return - if(3.0) + if(3) return else return diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 4d88e548004..386dd241867 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -16,7 +16,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "morgue1" density = 1 - anchored = 1.0 + anchored = 1 var/obj/structure/tray/connected = null var/locked = 0 @@ -206,7 +206,7 @@ var/global/list/crematoriums = new/list() density = 1 layer = 2.9 var/obj/structure/bodycontainer/connected = null - anchored = 1.0 + anchored = 1 pass_flags = LETPASSTHROW /obj/structure/tray/Destroy() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 160c798e99c..fd973b1d044 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -78,7 +78,7 @@ desc = "A collapsed roller bed that can be carried around." icon = 'icons/obj/rollerbed.dmi' icon_state = "folded" - w_class = 4.0 // Can't be put in backpacks. + w_class = 4 // Can't be put in backpacks. /obj/item/roller/attack_self(mob/user) diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index b7862562752..7e27d6e31c3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -3,19 +3,19 @@ desc = "Apply butt." icon = 'icons/obj/objects.dmi' icon_state = "stool" - anchored = 1.0 + anchored = 1 /obj/structure/stool/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(70)) new /obj/item/stack/sheet/metal(loc) qdel(src) return - if(3.0) + if(3) if (prob(50)) new /obj/item/stack/sheet/metal(loc) qdel(src) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 334be992a43..59afbcb77fc 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -18,7 +18,7 @@ icon = 'icons/obj/smooth_structures/table.dmi' icon_state = "table" density = 1 - anchored = 1.0 + anchored = 1 layer = 2.8 pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.") var/frame = /obj/structure/table_frame @@ -363,20 +363,20 @@ icon = 'icons/obj/objects.dmi' icon_state = "rack" density = 1 - anchored = 1.0 + anchored = 1 pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density. var/health = 5 /obj/structure/rack/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) - if(2.0) + if(2) if(prob(50)) rack_destroy() else qdel(src) - if(3.0) + if(3) if(prob(25)) rack_destroy() diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 67a0b441ce0..bd9389998d2 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "dispenser" density = 1 - anchored = 1.0 + anchored = 1 var/oxygentanks = 10 var/plasmatanks = 10 var/list/oxytanks = list() //sorry for the similar var names diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 1b54309a8d4..e0429724bd5 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -7,7 +7,7 @@ icon_state = "E-W" density = 1 layer = 3.1 - anchored = 1.0 + anchored = 1 var/tube_construction = /obj/structure/c_transit_tube var/list/tube_dirs = null var/exit_delay = 1 diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index e226e7215e6..6f56404e11e 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -7,7 +7,7 @@ icon_state = "E-W" //icon_state decides which tube will be built density = 0 layer = 3.1 //same as the built tube - anchored = 0.0 + anchored = 0 //wrapper for turn that changes the transit tube formatted icon_state instead of the dir /obj/structure/c_transit_tube/proc/tube_turn(angle) @@ -138,5 +138,5 @@ name = "unattached transit tube pod" icon = 'icons/obj/atmospherics/pipes/transit_tube_pod.dmi' icon_state = "pod" - anchored = 0.0 + anchored = 0 density = 0 diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index d330273aa50..a4bd81856e7 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/pipes/transit_tube_pod.dmi' icon_state = "pod" animate_movement = FORWARD_STEPS - anchored = 1.0 + anchored = 1 density = 1 var/moving = 0 var/datum/gas_mixture/air_contents = new() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index bcfb5b739f4..89f53865e2d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -53,13 +53,13 @@ /obj/structure/window/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) spawnfragments() return - if(3.0) + if(3) if(prob(50)) spawnfragments() return diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 457154db0f2..086ab95e10c 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -6,7 +6,7 @@ /obj/structure/shuttle/engine name = "engine" density = 1 - anchored = 1.0 + anchored = 1 /obj/structure/shuttle/engine/heater name = "heater" diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 6b23686fbca..601adf0b9a4 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -50,9 +50,9 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," ex_act(3) return switch(severity) - if(1.0) + if(1) src.ChangeTurf(src.baseturf) - if(2.0) + if(2) switch(pick(1,2;75,3)) if(1) src.ReplaceWithLattice() @@ -66,7 +66,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," src.break_tile() src.hotspot_expose(1000,CELL_VOLUME) if(prob(33)) new /obj/item/stack/sheet/metal(src) - if(3.0) + if(3) if (prob(50)) src.break_tile() src.hotspot_expose(1000,CELL_VOLUME) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 32a43d63195..9ed49d5e41a 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -108,14 +108,14 @@ /turf/simulated/floor/engine/ex_act(severity,target) switch(severity) - if(1.0) + if(1) if(prob(80)) ReplaceWithLattice() else if(prob(50)) qdel(src) else make_plating(1) - if(2.0) + if(2) if(prob(50)) make_plating(1) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 8a104b9be2a..135d7e750a4 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -65,16 +65,16 @@ dismantle_wall(1,1) return switch(severity) - if(1.0) + if(1) //SN src = null src.ChangeTurf(src.baseturf) return - if(2.0) + if(2) if (prob(50)) dismantle_wall(0,1) else dismantle_wall(1,1) - if(3.0) + if(3) if (prob(hardness)) dismantle_wall(0,1) else diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 3db0aa0ae76..5e55761ef56 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -1,6 +1,6 @@ /turf icon = 'icons/turf/floors.dmi' - level = 1.0 + level = 1 var/slowdown = 0 //negative for faster, positive for slower var/intact = 1 diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index dbeceda3949..c2eeb2b9d55 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "" flags = CONDUCT - w_class = 2.0 + w_class = 2 materials = list(MAT_METAL=100) throwforce = 2 throw_speed = 3 diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 3cca149d6e7..9e5cc53faf9 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/tank.dmi' item_state = "assembly" throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 2 throw_range = 4 flags = CONDUCT diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index dd40a3a2d80..42a25ec7aa8 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -5,7 +5,7 @@ item_state = "assembly" flags = CONDUCT throwforce = 5 - w_class = 2.0 + w_class = 2 throw_speed = 2 throw_range = 7 diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 103921f7ef5..8d53d453bc8 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -156,9 +156,9 @@ var/obj/effect/beam/i_beam/previous = null var/obj/item/device/assembly/infra/master = null var/limit = null - var/visible = 0.0 + var/visible = 0 var/left = null - anchored = 1.0 + anchored = 1 /obj/effect/beam/i_beam/proc/hit() diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 01251e9dba6..e1e6739b812 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -5,7 +5,7 @@ icon_state = "shock_kit" var/obj/item/clothing/head/helmet/part1 = null var/obj/item/device/electropack/part2 = null - w_class = 5.0 + w_class = 5 flags = CONDUCT /obj/item/assembly/shock_kit/Destroy() diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 8b8baf4249c..ac53dca5b18 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -181,7 +181,7 @@ var/sc_safecode5 = "[rand(0,9)]" L.gib() else if(istype(A,/obj/)) var/obj/O = A - O.ex_act(1.0) + O.ex_act(1) if(O) qdel(O) else if(isturf(A)) var/turf/T = A diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 05f35c301cb..1aff0662890 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -21,7 +21,7 @@ //Ears: currently only used for headsets and earmuffs /obj/item/clothing/ears name = "ears" - w_class = 1.0 + w_class = 1 throwforce = 0 slot_flags = SLOT_EARS burn_state = -1 //Not Burnable @@ -40,7 +40,7 @@ /obj/item/clothing/glasses name = "glasses" icon = 'icons/obj/clothing/glasses.dmi' - w_class = 2.0 + w_class = 2 flags_cover = GLASSESCOVERSEYES slot_flags = SLOT_EYES var/vision_flags = 0 @@ -66,7 +66,7 @@ BLIND // can't see anything /obj/item/clothing/gloves name = "gloves" gender = PLURAL //Carn: for grammarically correct text-parsing - w_class = 2.0 + w_class = 2 icon = 'icons/obj/clothing/gloves.dmi' siemens_coefficient = 0.50 body_parts_covered = HANDS diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index ccb288dd6cc..1e84341c640 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -208,11 +208,11 @@ icon = 'icons/obj/janitor.dmi' icon_state = "cone" item_state = "cone" - force = 1.0 - throwforce = 3.0 + force = 1 + throwforce = 3 throw_speed = 2 throw_range = 5 - w_class = 2.0 + w_class = 2 attack_verb = list("warned", "cautioned", "smashed") burn_state = -1 //Won't burn in fires diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index cd6dae472dc..9f51b0bd242 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -47,7 +47,7 @@ desc = "It's tasty looking!" icon_state = "cake0" flags_cover = HEADCOVERSEYES - var/onfire = 0.0 + var/onfire = 0 var/status = 0 var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage var/processing = 0 //I dont think this is used anywhere. diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 34cc80ba905..e325df02c58 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -4,7 +4,7 @@ icon_state = "gas_alt" flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE - w_class = 3.0 + w_class = 3 item_state = "gas_alt" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index a765e850687..ac3beecfb69 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -9,7 +9,7 @@ ignore_maskadjust = 0 flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEFACE - w_class = 2.0 + w_class = 2 visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS visor_flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a9a1d0f6133..9c9dc3d7a75 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -122,7 +122,7 @@ /obj/item/clothing/suit/armor/reactive name = "reactive teleport armor" desc = "Someone seperated our Research Director from his own head!" - var/active = 0.0 + var/active = 0 icon_state = "reactiveoff" item_state = "reactiveoff" blood_overlay_type = "armor" diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 093b14d0a1f..88c20f934b5 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -21,7 +21,7 @@ permeability_coefficient = 0.01 flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - slowdown = 1.0 + slowdown = 1 allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 2236cf7f230..db02b95bb81 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -19,7 +19,7 @@ permeability_coefficient = 0.50 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/extinguisher) - slowdown = 1.0 + slowdown = 1 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags = STOPSPRESSUREDMAGE | THICKMATERIAL heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 3bb34fbe5db..353da634cd3 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -6,7 +6,7 @@ item_state = "" //no inhands item_color = "bluetie" slot_flags = 0 - w_class = 2.0 + w_class = 2 /obj/item/clothing/tie/blue name = "blue tie" diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 66323ca69de..a35fe5de224 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -6,7 +6,7 @@ name = "forensic scanner" desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings." icon_state = "forensicnew" - w_class = 3.0 + w_class = 3 item_state = "electronic" flags = CONDUCT | NOBLUDGEON slot_flags = SLOT_BELT diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 4b298b11009..1cb5307147c 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -554,14 +554,14 @@ /obj/effect/spacevine/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(90)) qdel(src) return - if(3.0) + if(3) if (prob(50)) qdel(src) return diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 1fbaecb1a99..599b9a6d26e 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -22,7 +22,7 @@ /obj/item/weapon/greentext/ name = "greentext" desc = "No one knows what this massive tome does, but it feels desirable all the same..." - w_class = 4.0 + w_class = 4 icon = 'icons/obj/wizard.dmi' icon_state = "greentext" var/mob/living/last_holder diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index 32829a9f6f1..47975d17927 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -129,14 +129,6 @@ list_reagents = list("coffee" = 30) spillable = 1 -/obj/item/weapon/reagent_containers/food/drinks/tea - name = "Duke Purple Tea" - desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." - icon_state = "tea" - item_state = "coffee" - list_reagents = list("tea" = 30) - spillable = 1 - /obj/item/weapon/reagent_containers/food/drinks/ice name = "Ice Cup" desc = "Careful, cold ice, do not chew." @@ -144,14 +136,29 @@ list_reagents = list("ice" = 30) spillable = 1 -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate - name = "Dutch Hot Coco" - desc = "Made in Space South America." +/obj/item/weapon/reagent_containers/food/drinks/mug/ // parent type is literally just so empty mug sprites are a thing + name = "mug" + desc = "A drink served in a classy mug." icon_state = "tea" item_state = "coffee" - list_reagents = list("hot_coco" = 30, "sugar" = 5) spillable = 1 +/obj/item/weapon/reagent_containers/food/drinks/mug/on_reagent_change() + if(reagents.total_volume) + icon_state = "tea" + else + icon_state = "tea_empty" + +/obj/item/weapon/reagent_containers/food/drinks/mug/tea + name = "Duke Purple Tea" + desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." + list_reagents = list("tea" = 30) + +/obj/item/weapon/reagent_containers/food/drinks/mug/coco + name = "Dutch Hot Coco" + desc = "Made in Space South America." + list_reagents = list("hot_coco" = 30, "sugar" = 5) + /obj/item/weapon/reagent_containers/food/drinks/dry_ramen name = "Cup Ramen" desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years." diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index 8f003e6fb75..ddbd708c367 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -136,8 +136,8 @@ desc = "A bottle with a sharp broken bottom." icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" - force = 9.0 - throwforce = 5.0 + force = 9 + throwforce = 5 throw_speed = 3 throw_range = 5 item_state = "beer" @@ -304,7 +304,7 @@ var/area/bombarea = get_area(bombturf) message_admins("[key_name(user)]? has primed a [name] for detonation at [bombarea] (JMP).") log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] ([bombturf.x],[bombturf.y],[bombturf.z]).") - + user << "You light \the [src] on fire." overlays += fire_overlay if(!isGlass) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 10af706e393..129f099be22 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -49,7 +49,7 @@ icon_state = "logs" force = 5 throwforce = 5 - w_class = 3.0 + w_class = 3 throw_speed = 2 throw_range = 3 plant_type = 2 @@ -110,7 +110,7 @@ force = 0 slot_flags = SLOT_HEAD throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 1 throw_range = 3 @@ -128,7 +128,7 @@ force = 0 slot_flags = SLOT_HEAD throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 1 throw_range = 3 plant_type = 0 @@ -172,7 +172,7 @@ force = 15 hitsound = 'sound/weapons/bladeslice.ogg' throwforce = 5 - w_class = 1.0 + w_class = 1 throw_speed = 1 throw_range = 3 plant_type = 1 @@ -258,7 +258,7 @@ icon = 'icons/obj/items.dmi' icon_state = "banana_peel" item_state = "banana_peel" - w_class = 1.0 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 7 @@ -295,7 +295,7 @@ desc = "A reminder of meals gone by." icon_state = "corncob" item_state = "corncob" - w_class = 1.0 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 7 @@ -314,7 +314,7 @@ desc = "A cob with snap pops" icon_state = "snapcorn" item_state = "corncob" - w_class = 1.0 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 7 diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 46c56442345..a2c5a001a3e 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -24,7 +24,7 @@ flags = OPENCONTAINER slot_flags = SLOT_BELT throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 10 @@ -46,7 +46,7 @@ flags = OPENCONTAINER slot_flags = SLOT_BELT throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 10 @@ -65,9 +65,9 @@ icon_state = "cultivator" item_state = "cultivator" flags = CONDUCT - force = 5.0 - throwforce = 7.0 - w_class = 2.0 + force = 5 + throwforce = 7 + w_class = 2 materials = list(MAT_METAL=50) attack_verb = list("slashed", "sliced", "cut", "clawed") hitsound = 'sound/weapons/bladeslice.ogg' @@ -78,9 +78,9 @@ icon = 'icons/obj/weapons.dmi' icon_state = "hatchet" flags = CONDUCT - force = 12.0 - w_class = 1.0 - throwforce = 15.0 + force = 12 + w_class = 1 + throwforce = 15 throw_speed = 3 throw_range = 4 materials = list(MAT_METAL=15000) @@ -97,11 +97,11 @@ icon_state = "scythe0" name = "scythe" desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." - force = 13.0 - throwforce = 5.0 + force = 13 + throwforce = 5 throw_speed = 2 throw_range = 3 - w_class = 4.0 + w_class = 4 flags = CONDUCT | NOSHIELD slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" @@ -123,14 +123,14 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" volume = 50 - w_class = 1.0 + w_class = 1 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/New() ..() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 96dc3f1b9a1..3cb02b4f5ed 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -284,7 +284,7 @@ icon_state ="scanner" throw_speed = 3 throw_range = 5 - w_class = 1.0 + w_class = 1 var/obj/machinery/computer/libraryconsole/bookmanagement/computer //Associated computer - Modes 1 to 3 use this var/obj/item/weapon/book/book //Currently scanned book var/mode = 0 //0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 36b7e7e4eb4..fe33b1317b1 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "ore_redemption" density = 1 - anchored = 1.0 + anchored = 1 input_dir = NORTH output_dir = SOUTH req_access = list(access_mineral_storeroom) @@ -257,7 +257,7 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "mining" density = 1 - anchored = 1.0 + anchored = 1 var/obj/item/weapon/card/id/inserted_id var/list/prize_list = list( new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50), @@ -440,7 +440,7 @@ icon_state = "Jaunter" item_state = "electronic" throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 5 origin_tech = "bluespace=2" @@ -719,7 +719,7 @@ icon_state = "lazarus_hypo" item_state = "hypo" throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 5 var/loaded = 1 @@ -774,7 +774,7 @@ name = "mining scanner" icon_state = "mining1" item_state = "analyzer" - w_class = 2.0 + w_class = 2 flags = CONDUCT slot_flags = SLOT_BELT var/cooldown = 0 @@ -805,7 +805,7 @@ name = "advanced mining scanner" icon_state = "mining0" item_state = "analyzer" - w_class = 2.0 + w_class = 2 flags = CONDUCT slot_flags = SLOT_BELT var/cooldown = 0 diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index 2c9d289a9cf..e17cc7107f9 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -5,7 +5,7 @@ icon_state = "x2" name = "Input area" density = 0 - anchored = 1.0 + anchored = 1 New() icon_state = "blank" @@ -14,7 +14,7 @@ icon_state = "x" name = "Output area" density = 0 - anchored = 1.0 + anchored = 1 New() icon_state = "blank" diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index aec2fce7f5a..37ce43abc46 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -61,7 +61,7 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "stacker" density = 1 - anchored = 1.0 + anchored = 1 var/obj/machinery/mineral/stacking_unit_console/CONSOLE var/stk_types = list() var/stk_amt = list() diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index 3f60571df9f..4c86526f01d 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "unloader" density = 1 - anchored = 1.0 + anchored = 1 input_dir = WEST output_dir = EAST diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c9a11073725..ca013ea9fc3 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -62,9 +62,9 @@ flags = CONDUCT slot_flags = SLOT_BELT force = 15 - throwforce = 10.0 + throwforce = 10 item_state = "pickaxe" - w_class = 4.0 + w_class = 4 materials = list(MAT_METAL=2000) //one sheet, but where can you make them? var/digspeed = 40 var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg') @@ -128,11 +128,11 @@ icon_state = "shovel" flags = CONDUCT slot_flags = SLOT_BELT - force = 8.0 + force = 8 var/digspeed = 20 - throwforce = 4.0 + throwforce = 4 item_state = "shovel" - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=50) origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") @@ -142,9 +142,9 @@ desc = "A small tool for digging and moving dirt." icon_state = "spade" item_state = "spade" - force = 5.0 - throwforce = 7.0 - w_class = 2.0 + force = 5 + throwforce = 7 + w_class = 2 /**********************Mining car (Crate like thing, not the rail car)**************************/ @@ -168,7 +168,7 @@ desc = "An emergency shelter stored within a pocket of bluespace." icon_state = "pill3" icon = 'icons/obj/chemical.dmi' - w_class = 1.0 + w_class = 1 var/used = FALSE /obj/item/weapon/survivalcapsule/attack_self() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1584f1d604d..07752bf7b6f 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -28,13 +28,13 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/ex_act(severity, target) ..() switch(severity) - if(3.0) + if(3) if (prob(75)) src.gets_drilled(null, 1) - if(2.0) + if(2) if (prob(90)) src.gets_drilled(null, 1) - if(1.0) + if(1) src.gets_drilled(null, 1) return @@ -85,7 +85,7 @@ var/global/list/rockTurfEdgeCache new src.type(T) /turf/simulated/mineral/random - name = "mineral deposit" + name = "rock" icon_state = "rock" var/mineralSpawnChanceList = list( "Uranium" = 5, "Diamond" = 1, "Gold" = 10, @@ -533,12 +533,12 @@ var/global/list/rockTurfEdgeCache /turf/simulated/floor/plating/asteroid/ex_act(severity, target) contents_explosion(severity, target) switch(severity) - if(3.0) + if(3) return - if(2.0) + if(2) if (prob(20)) src.gets_dug() - if(1.0) + if(1) src.gets_dug() return diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 9285f95aa1d..3caefd09573 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/economy.dmi' icon_state = "coinpress0" density = 1 - anchored = 1.0 + anchored = 1 var/amt_silver = 0 //amount of silver var/amt_gold = 0 //amount of gold var/amt_diamond = 0 diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index ed6056c382a..fd6125dbcda 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -5,9 +5,9 @@ name = "Money bag" icon_state = "moneybag" flags = CONDUCT - force = 10.0 + force = 10 throwforce = 0 - w_class = 4.0 + w_class = 4 burn_state = 0 //Burnable burntime = 20 diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 9865b25b95f..4e97e3fbbb0 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -219,7 +219,7 @@ flags = CONDUCT force = 1 throwforce = 2 - w_class = 1.0 + w_class = 1 var/string_attached var/list/sideslist = list("heads","tails") var/cmineral = null diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index ae838e5cff3..15d859a83fd 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -93,16 +93,16 @@ ..() switch (severity) - if (1.0) + if (1) gib() return - if (2.0) + if (2) adjustBruteLoss(60) adjustFireLoss(60) adjustEarDamage(30,120) - if(3.0) + if(3) adjustBruteLoss(30) if (prob(50)) Paralyse(1) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index eb8dc6e9c65..cb16be5dc03 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -45,12 +45,12 @@ if(status_flags & GODMODE) return if(exposed_temperature > bodytemperature) - var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - adjustFireLoss(20.0*discomfort) + var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1) + adjustFireLoss(20*discomfort) else - var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - adjustFireLoss(5.0*discomfort) + var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1) + adjustFireLoss(5*discomfort) /mob/living/carbon/brain/handle_regular_status_updates() //TODO: comment out the unused bits >_> diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6024ff02d0f..6a001457d30 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -78,7 +78,7 @@ . = ..() -/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, override = 0) +/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, override = 0) shock_damage *= siemens_coeff if(shock_damage<1 && !override) return 0 diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d55681b114f..c90c5171808 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -18,7 +18,7 @@ if(mind) miming=mind.miming - if(src.stat == 2.0 && (act != "deathgasp")) + if(src.stat == 2 && (act != "deathgasp")) return switch(act) //Please keep this alphabetically ordered when adding or changing emotes. if ("aflap") //Any emote on human that uses miming must be left in, oh well. diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7a52ea7fbdb..d8583ae8a8e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -112,7 +112,7 @@ var/b_loss = null var/f_loss = null switch (severity) - if (1.0) + if (1) b_loss += 500 if (prob(getarmor(null, "bomb"))) shred_clothing(1,150) @@ -122,7 +122,7 @@ gib() return - if (2.0) + if (2) b_loss += 60 f_loss += 60 @@ -138,7 +138,7 @@ if (prob(70)) Paralyse(10) - if(3.0) + if(3) b_loss += 30 if (prob(getarmor(null, "bomb"))) b_loss = b_loss/2 @@ -269,7 +269,7 @@ spreadFire(AM) //Added a safety check in case you want to shock a human mob directly through electrocute_act. -/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, safety = 0, override = 0) +/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0) if(!safety) if(gloves) var/obj/item/clothing/gloves/G = gloves diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 70d3d476103..4cd0b1b833a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -146,7 +146,7 @@ /mob/living/carbon/human/proc/restore_blood() if(!(NOBLOOD in dna.species.specflags)) var/blood_volume = vessel.get_reagent_amount("blood") - vessel.add_reagent("blood",560.0-blood_volume) + vessel.add_reagent("blood",560-blood_volume) //////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index d1c5b5bec1f..db4591a230d 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -360,6 +360,8 @@ head = I if(head.flags & BLOCKHAIR) update_hair(redraw_mob) //rebuild hair + if(head.flags_inv & HIDEEARS) + update_body(redraw_mob) update_inv_head(redraw_mob) if(slot_shoes) shoes = I diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a6d1e8857b6..80e69da0418 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -164,7 +164,7 @@ /mob/living/carbon/human/proc/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = get_heat_protection_flags(temperature) - var/thermal_protection = 0.0 + var/thermal_protection = 0 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) thermal_protection += THERMAL_PROTECTION_HEAD @@ -229,7 +229,7 @@ temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K. var/thermal_protection_flags = get_cold_protection_flags(temperature) - var/thermal_protection = 0.0 + var/thermal_protection = 0 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) thermal_protection += THERMAL_PROTECTION_HEAD diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 88599a8eb1d..0ec31fdd1a3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -399,6 +399,8 @@ Please contact me on #coderbus IRC. ~Carnie x if(hud_used.inventory_shown) //if the inventory is open ... H.screen_loc = ui_head //TODO //...draw the item in the inventory screen client.screen += H //Either way, add the item to the HUD + + update_mutant_bodyparts() apply_overlay(HEAD_LAYER) diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 44ba92c73f2..bc7cad681a5 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -24,8 +24,6 @@ if(I == head) head = null - if(I.flags & BLOCKHAIR) - update_hair() update_inv_head() else if(I == back) back = null diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f8aebb101fa..a36af4ec5b5 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -199,14 +199,14 @@ /mob/living/carbon/monkey/ex_act(severity, target) ..() switch(severity) - if(1.0) + if(1) gib() return - if(2.0) + if(2) adjustBruteLoss(60) adjustFireLoss(60) adjustEarDamage(30,120) - if(3.0) + if(3) adjustBruteLoss(30) if (prob(50)) Paralyse(10) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7ce373846e3..05fed0bff86 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -186,7 +186,7 @@ Sorry Giacom. Please don't be mad :( death() /mob/living/proc/InCritical() - return (src.health < 0 && src.health > -95.0 && stat == UNCONSCIOUS) + return (src.health < 0 && src.health > -95 && stat == UNCONSCIOUS) /mob/living/ex_act(severity, target) ..() @@ -385,7 +385,7 @@ Sorry Giacom. Please don't be mad :( return 0 -/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, safety = 0) +/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0) return 0 //only carbon liveforms have this proc /mob/living/emp_act(severity) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 8fa8325119f..267a69f5577 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -380,13 +380,13 @@ var/list/ai_list = list() ..() switch(severity) - if(1.0) + if(1) gib() - if(2.0) + if(2) if (stat != 2) adjustBruteLoss(60) adjustFireLoss(60) - if(3.0) + if(3) if (stat != 2) adjustBruteLoss(30) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index ecb7eca0247..c1ea89972d6 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -138,15 +138,15 @@ ..() switch(severity) - if(1.0) + if(1) if (src.stat != 2) adjustBruteLoss(100) adjustFireLoss(100) - if(2.0) + if(2) if (src.stat != 2) adjustBruteLoss(60) adjustFireLoss(60) - if(3.0) + if(3) if (src.stat != 2) adjustBruteLoss(30) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index bec3e1f8637..d765473f1a6 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -347,14 +347,14 @@ /mob/living/silicon/robot/ex_act(severity, target) switch(severity) - if(1.0) + if(1) gib() return - if(2.0) + if(2) if (stat != 2) adjustBruteLoss(60) adjustFireLoss(60) - if(3.0) + if(3) if (stat != 2) adjustBruteLoss(30) return @@ -1058,7 +1058,7 @@ robot_suit.r_leg = null new /obj/item/stack/cable_coil(T, robot_suit.chest.wires) robot_suit.chest.loc = T - robot_suit.chest.wires = 0.0 + robot_suit.chest.wires = 0 robot_suit.chest = null robot_suit.l_arm.loc = T robot_suit.l_arm = null diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 9bc33156523..ad5e2644e66 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -2,7 +2,7 @@ name = "robot module" icon = 'icons/obj/module.dmi' icon_state = "std_module" - w_class = 100.0 + w_class = 100 item_state = "electronic" flags = CONDUCT diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 052dc76c46a..bcf46938bba 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -97,11 +97,11 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target) switch(severity) - if(1.0) + if(1) gib() - if(2.0) + if(2) adjustBruteLoss(140) - if(3.0) + if(3) adjustBruteLoss(110) /mob/living/simple_animal/hostile/asteroid/basilisk/death(gibbed) @@ -425,10 +425,10 @@ /obj/effect/goliath_tentacle/proc/Trip() for(var/mob/living/M in src.loc) + visible_message("The [src.name] grabs hold of [M.name]!") M.Stun(5) M.adjustBruteLoss(rand(10,15)) latched = 1 - visible_message("The [src.name] grabs hold of [M.name]!") if(!latched) qdel(src) else diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index e783b47f745..36055b70011 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -402,14 +402,14 @@ /mob/living/simple_animal/ex_act(severity, target) ..() switch (severity) - if (1.0) + if (1) gib() return - if (2.0) + if (2) adjustBruteLoss(60) - if(3.0) + if(3) adjustBruteLoss(30) updatehealth() diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index e18d8be2749..10c009cbd46 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -14,7 +14,7 @@ layer = 21 item_state = "nothing" - w_class = 5.0 + w_class = 5 /obj/item/weapon/grab/New(mob/user, mob/victim) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index 053931b171e..9af14584432 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -104,11 +104,11 @@ It is possible to destroy the net by the occupant or someone else. /obj/effect/energy_net/ex_act(severity, target) switch(severity) - if(1.0) + if(1) health-=50 - if(2.0) + if(2) health-=50 - if(3.0) + if(3) health-=prob(50)?50:25 healthcheck() return diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index d3aba358c3c..c3c27a16611 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -39,11 +39,11 @@ Contents: //Main function variables. var/s_initialized = 0//Suit starts off. var/s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick(). - var/s_cost = 5.0//Base energy cost each ntick. - var/s_acost = 25.0//Additional cost for additional powers active. - var/s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability. - var/a_transfer = 20.0//How much reagent is transferred when injecting. - var/r_maxamount = 80.0//How much reagent in total there is. + var/s_cost = 5//Base energy cost each ntick. + var/s_acost = 25//Additional cost for additional powers active. + var/s_delay = 40//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability. + var/a_transfer = 20//How much reagent is transferred when injecting. + var/r_maxamount = 80//How much reagent in total there is. //Support function variables. var/spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check ninja_equipment.dm for how it all works. @@ -51,8 +51,8 @@ Contents: var/s_busy = 0//Is the suit busy with a process? Like AI hacking. Used for safety functions. //Ability function variables. - var/s_bombs = 10.0//Number of starting ninja smoke bombs. - var/a_boost = 3.0//Number of adrenaline boosters. + var/s_bombs = 10//Number of starting ninja smoke bombs. + var/a_boost = 3//Number of adrenaline boosters. /obj/item/clothing/suit/space/space_ninja/New() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 46ddcd420fd..8cb5ae8902c 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -4,7 +4,7 @@ icon_state = "clipboard" item_state = "clipboard" throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 7 var/obj/item/weapon/pen/haspen //The stored pen. diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 09a345c0b3c..afbbe58bacb 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -68,4 +68,4 @@ desc = "A roll of paper. Use it on a hand labeler to refill it." icon_state = "labeler_refill" item_state = "electropack" - w_class = 1.0 \ No newline at end of file + w_class = 1 \ No newline at end of file diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 2218bda0a71..a0c72c0ee09 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" throwforce = 0 - w_class = 1.0 + w_class = 1 throw_range = 1 throw_speed = 1 layer = 3 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 219449f1228..414aaba7db2 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -18,7 +18,7 @@ item_state = "pen" slot_flags = SLOT_BELT | SLOT_EARS throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=10) @@ -82,7 +82,7 @@ reagents.add_reagent("morphine", 20) reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10) - ..() + ..() /* * (Alan) Edaggers @@ -121,4 +121,4 @@ item_state = "edagger" else icon_state = initial(icon_state) //looks like a normal pen when off. - item_state = initial(item_state) + item_state = initial(item_state) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 321c69f15ba..835b33b40fb 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -16,7 +16,7 @@ desc = "A camera film cartridge. Insert it into a camera to reload it." icon_state = "film" item_state = "electropack" - w_class = 1.0 + w_class = 1 burn_state = 0 //Burnable /* @@ -27,7 +27,7 @@ icon = 'icons/obj/items.dmi' icon_state = "photo" item_state = "paper" - w_class = 1.0 + w_class = 1 burn_state = 0 //Burnable burntime = 5 var/icon/img //Big photo image @@ -105,7 +105,7 @@ desc = "A polaroid camera." icon_state = "camera" item_state = "electropack" - w_class = 2.0 + w_class = 2 flags = CONDUCT slot_flags = SLOT_BELT materials = list(MAT_METAL=2000) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 3fb4af902ad..36204ae1fc6 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -5,7 +5,7 @@ icon_state = "stamp-ok" item_state = "stamp" throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=60) diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index ff2d0043c42..decc6ab5498 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -17,18 +17,18 @@ /obj/item/weapon/am_containment/ex_act(severity, target) switch(severity) - if(1.0) + if(1) explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess if(src) qdel(src) - if(2.0) + if(2) if(prob((fuel/10)-stability)) explosion(get_turf(src), 1, 2, 3, 5) if(src) qdel(src) return stability -= 40 - if(3.0) + if(3) stability -= 20 //check_stability() return diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 87392fd982f..562b63310f7 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -196,7 +196,7 @@ icon = 'icons/obj/machines/antimatter.dmi' icon_state = "box" item_state = "electronic" - w_class = 4.0 + w_class = 4 flags = CONDUCT throwforce = 5 throw_speed = 1 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 03f95d9fefb..e22dae496c1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -173,7 +173,7 @@ if(cell_type) src.cell = new/obj/item/weapon/stock_parts/cell(src) cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively) - cell.charge = start_charge * cell.maxcharge / 100.0 // (convert percentage to actual value) + cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value) var/area/A = src.loc.loc @@ -560,7 +560,7 @@ if ( ((stat & BROKEN) || malfhack) \ && !opened \ && W.force >= 5 \ - && W.w_class >= 3.0 \ + && W.w_class >= 3 \ && prob(20) ) opened = 2 user.visible_message("[user.name] has knocked down the APC cover with the [W.name].", \ diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index dafa5859eff..35f77d258e8 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -162,7 +162,7 @@ By design, d1 is the smallest direction and d2 is the highest src.add_fingerprint(user) // shock the user with probability prb -/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1.0) +/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1) if(!prob(prb)) return 0 if (electrocute_mob(user, powernet, src, siemens_coeff)) @@ -471,7 +471,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ item_color = "red" desc = "A coil of power cable." throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=50, MAT_GLASS=20) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 5956b2b1aad..7900a52ba01 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -5,8 +5,8 @@ icon_state = "cell" item_state = "cell" origin_tech = "powerstorage=1" - force = 5.0 - throwforce = 5.0 + force = 5 + throwforce = 5 throw_speed = 2 throw_range = 5 w_class = 2 @@ -33,7 +33,7 @@ overlays += image('icons/obj/power.dmi', "cell-o1") /obj/item/weapon/stock_parts/cell/proc/percent() // return % charge of cell - return 100.0*charge/maxcharge + return 100*charge/maxcharge // use power from a cell /obj/item/weapon/stock_parts/cell/proc/use(amount) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index b5a229778af..213b288b724 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -9,7 +9,7 @@ /obj/machinery/power name = null icon = 'icons/obj/power.dmi' - anchored = 1.0 + anchored = 1 var/datum/powernet/powernet = null use_power = 0 idle_power_usage = 0 @@ -280,7 +280,7 @@ //power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. -/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1.0) +/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1) if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index bbfa406ad58..d8aa85ac91e 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -65,7 +65,7 @@ /obj/singularity/narsie/proc/godsmack(atom/A) if(istype(A,/obj/)) var/obj/O = A - O.ex_act(1.0) + O.ex_act(1) if(O) qdel(O) else if(isturf(A)) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 5d5b6d42153..b9578936e24 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -65,16 +65,16 @@ /obj/singularity/ex_act(severity, target) switch(severity) - if(1.0) + if(1) if(current_size <= STAGE_TWO) investigate_log("has been destroyed by a heavy explosion.","singulo") qdel(src) return else energy -= round(((energy+1)/2),1) - if(2.0) + if(2) energy -= round(((energy+1)/3),1) - if(3.0) + if(3) energy -= round(((energy+1)/4),1) return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 2a402459d1b..fe60d38873c 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -334,7 +334,7 @@ /obj/machinery/power/smes/get_ui_data() var/list/data = list( - "capacityPercent" = round(100.0*charge/capacity, 0.1), + "capacityPercent" = round(100*charge/capacity, 0.1), "capacity" = capacity, "charge" = charge, diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 27a1309f57b..64e1e18cd1c 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -6,7 +6,7 @@ flags = CONDUCT slot_flags = SLOT_BELT throwforce = 0 - w_class = 1.0 + w_class = 1 var/fire_sound = null //What sound should play when this ammo is fired var/caliber = null //Which kind of guns it can be loaded into var/projectile_type = null //The bullet type to create when New() is called @@ -19,8 +19,8 @@ ..() if(projectile_type) BB = new projectile_type(src) - pixel_x = rand(-10.0, 10) - pixel_y = rand(-10.0, 10) + pixel_x = rand(-10, 10) + pixel_y = rand(-10, 10) dir = pick(alldirs) update_icon() @@ -64,7 +64,7 @@ item_state = "syringe_kit" materials = list(MAT_METAL=30000) throwforce = 2 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 7 var/list/stored_ammo = list() diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 26b4bc77e99..0016762d39e 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -84,7 +84,7 @@ projectile_type = /obj/item/projectile/bullet/pellet/random materials = list(MAT_METAL=250) pellets = 5 - variance = 1.0 + variance = 1 /obj/item/ammo_casing/shotgun/improvised/overload/New() ..() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index fe5ef91095c..3f64abf3237 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -11,11 +11,11 @@ flags = CONDUCT slot_flags = SLOT_BELT materials = list(MAT_METAL=2000) - w_class = 3.0 + w_class = 3 throwforce = 5 throw_speed = 3 throw_range = 5 - force = 5.0 + force = 5 origin_tech = "combat=1" needs_permit = 1 attack_verb = list("struck", "hit", "bashed") diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 86ce5ad77dc..2e86e52f5fd 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -3,7 +3,7 @@ desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." icon_state = "laser" item_state = "laser" - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=2000) origin_tech = "combat=3;magnets=2" ammo_type = list(/obj/item/ammo_casing/energy/lasergun) @@ -84,7 +84,7 @@ desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!" icon_state = "lasercannon" item_state = "laser" - w_class = 4.0 + w_class = 4 force = 10 flags = CONDUCT slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 941699010c2..40b6843c936 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -53,10 +53,10 @@ origin_tech = "combat=3;materials=5;powerstorage=3" var/fail_state = 0 var/charge_tick = 0 - can_flashlight = 0 pin = null can_charge = 0 ammo_x_offset = 1 + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler) /obj/item/weapon/gun/energy/gun/nuclear/New() ..() diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 39a23d5c07d..2c38f1b8c85 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -4,10 +4,10 @@ icon = 'icons/obj/guns/projectile.dmi' icon_state = "riotgun" item_state = "riotgun" - w_class = 4.0 + w_class = 4 throw_speed = 2 throw_range = 7 - force = 5.0 + force = 5 var/list/grenades = new/list() var/max_grenades = 3 materials = list(MAT_METAL=2000) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 03c38726f09..3de838042f6 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -3,7 +3,7 @@ name = "projectile gun" icon_state = "pistol" origin_tech = "combat=2;materials=2" - w_class = 3.0 + w_class = 3 materials = list(MAT_METAL=1000) var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 18ed36b8016..6bef8b20692 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -3,7 +3,7 @@ desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath." icon_state = "shotgun" item_state = "shotgun" - w_class = 4.0 + w_class = 4 force = 10 flags = CONDUCT slot_flags = SLOT_BACK @@ -122,7 +122,7 @@ desc = "A true classic." icon_state = "dshotgun" item_state = "shotgun" - w_class = 4.0 + w_class = 4 force = 10 flags = CONDUCT slot_flags = SLOT_BACK @@ -175,7 +175,7 @@ desc = "Essentially a tube that aims shotgun shells." icon_state = "ishotgun" item_state = "shotgun" - w_class = 4.0 + w_class = 4 force = 10 slot_flags = null origin_tech = "combat=2;materials=2" @@ -234,7 +234,7 @@ name = "sawn-off [src.name]" desc = sawn_desc icon_state = "[icon_state]-sawn" - w_class = 3.0 + w_class = 3 item_state = "gun" slot_flags &= ~SLOT_BACK //you can't sling it on your back slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) @@ -252,7 +252,7 @@ desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines." icon_state = "bulldog" item_state = "bulldog" - w_class = 3.0 + w_class = 3 origin_tech = "combat=5;materials=4;syndicate=6" mag_type = /obj/item/ammo_box/magazine/m12g fire_sound = 'sound/weapons/Gunshot.ogg' diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm index 213641af8df..bf01060db8f 100644 --- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm +++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm @@ -426,8 +426,8 @@ O.show_message(text("The [slime] is driven into a frenzy!"), 1) //Pink -/datum/chemical_reaction/slimeppotion - name = "Slime Potion" +/datum/chemical_reaction/docility + name = "Docility Potion" id = "m_potion" result = null required_reagents = list("plasma" = 1) @@ -435,9 +435,9 @@ required_container = /obj/item/slime_extract/pink required_other = 1 -/datum/chemical_reaction/slimeppotion/on_reaction(datum/reagents/holder) +/datum/chemical_reaction/docility/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/P = new /obj/item/slimepotion + var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility P.loc = get_turf(holder.my_atom) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 0da770be3ec..a1b729a8556 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -253,7 +253,7 @@ icon_state = "bucket" item_state = "bucket" materials = list(MAT_METAL=200) - w_class = 3.0 + w_class = 3 amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10,20,30,50,70) volume = 70 diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 46aef0834e4..b35b9330ab7 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -7,7 +7,7 @@ flags = OPENCONTAINER | NOBLUDGEON slot_flags = SLOT_BELT throwforce = 0 - w_class = 2.0 + w_class = 2 throw_speed = 3 throw_range = 7 var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self. @@ -152,7 +152,7 @@ icon_state = "chemsprayer" item_state = "chemsprayer" throwforce = 0 - w_class = 3.0 + w_class = 3 spray_maxrange = 7 spray_currentrange = 7 amount_per_transfer_from_this = 10 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index fc503fac901..165d4b0a31b 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -12,14 +12,14 @@ /obj/structure/reagent_dispensers/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(50)) qdel(src) return - if(3.0) + if(3) if (prob(5)) qdel(src) return @@ -67,15 +67,15 @@ /obj/structure/reagent_dispensers/watertank/ex_act(severity, target) switch(severity) - if(1.0) + if(1) qdel(src) return - if(2.0) + if(2) if (prob(50)) PoolOrNew(/obj/effect/effect/water, src.loc) qdel(src) return - if(3.0) + if(3) if (prob(5)) PoolOrNew(/obj/effect/effect/water, src.loc) qdel(src) @@ -197,4 +197,4 @@ /obj/structure/reagent_dispensers/virusfood/New() ..() - reagents.add_reagent("virusfood", 1000) + reagents.add_reagent("virusfood", 1000) diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 219785d1f33..0589e10be6d 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -342,14 +342,14 @@ H.contents_explosion(severity, target) switch(severity) - if(1.0) + if(1) broken(0) return - if(2.0) + if(2) health -= rand(5,15) healthcheck() return - if(3.0) + if(3) health -= rand(0,15) healthcheck() return diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 94b40c801a5..1121faf952f 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -237,6 +237,6 @@ icon = 'icons/obj/items.dmi' icon_state = "c_tube" throwforce = 0 - w_class = 1.0 + w_class = 1 throw_speed = 3 throw_range = 5 \ No newline at end of file diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 59205f31359..05c7eb41606 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -13,7 +13,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). var/g_amount = 0 var/gold_amount = 0 var/diamond_amount = 0 - var/max_material_amount = 75000.0 + var/max_material_amount = 75000 var/efficiency_coeff reagents = new(0) @@ -48,7 +48,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). G.reagents.trans_to(src, G.reagents.total_volume) for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) T += M.rating - max_material_amount = T * 75000.0 + max_material_amount = T * 75000 T = 0 for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) T += M.rating diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index b4076859184..ab486e299dd 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -65,13 +65,13 @@ other types of metals and chemistry for reagents). icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" item_state = "card-id" - w_class = 1.0 + w_class = 1 materials = list(MAT_METAL=30, MAT_GLASS=10) var/datum/design/blueprint /obj/item/weapon/disk/design_disk/New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) /////////////////////////////////// /////Non-Board Computer Stuff////// diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index df6389820a8..5ddfa1770f8 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -76,7 +76,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() icon_state = "server" name = "Messaging Server" density = 1 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 10 active_power_usage = 100 @@ -210,7 +210,7 @@ var/obj/machinery/blackbox_recorder/blackbox icon_state = "blackbox" name = "Blackbox Recorder" density = 1 - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 10 active_power_usage = 100 diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index d164418c115..7d714de9710 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -304,10 +304,10 @@ research holder datum. icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" item_state = "card-id" - w_class = 1.0 + w_class = 1 materials = list(MAT_METAL=30, MAT_GLASS=10) var/datum/tech/stored /obj/item/weapon/disk/tech_disk/New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) \ No newline at end of file + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) \ No newline at end of file diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index ac15222b3ff..e38ff62c635 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -69,12 +69,12 @@ name = "stock part" desc = "What?" icon = 'icons/obj/stock_parts.dmi' - w_class = 2.0 + w_class = 2 var/rating = 1 /obj/item/weapon/stock_parts/New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) //Rating 1 diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 777cb0bc607..4792688be1f 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -6,8 +6,8 @@ desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/slimes.dmi' icon_state = "grey slime extract" - force = 1.0 - w_class = 1.0 + force = 1 + w_class = 1 throwforce = 0 throw_speed = 3 throw_range = 6 @@ -476,10 +476,10 @@ singular_name = "floor tile" desc = "Through a series of micro-teleports these tiles let people move at incredible speeds" icon_state = "tile-bluespace" - w_class = 3.0 - force = 6.0 + w_class = 3 + force = 6 materials = list(MAT_METAL=937.5) - throwforce = 10.0 + throwforce = 10 throw_speed = 3 throw_range = 7 flags = CONDUCT @@ -499,10 +499,10 @@ singular_name = "floor tile" desc = "Time seems to flow very slowly around these tiles" icon_state = "tile-sepia" - w_class = 3.0 - force = 6.0 + w_class = 3 + force = 6 materials = list(MAT_METAL=937.5) - throwforce = 10.0 + throwforce = 10 throw_speed = 3 throw_range = 7 flags = CONDUCT diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index d87e5fdf524..b7e6c2798bf 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -14,7 +14,7 @@ var/mob/event_confirmed_by //1 = select event //2 = authenticate - anchored = 1.0 + anchored = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 6 diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 2aa37528aa2..53380e15d7c 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -5,7 +5,7 @@ icon_state = "retractor" materials = list(MAT_METAL=6000, MAT_GLASS=3000) flags = CONDUCT - w_class = 1.0 + w_class = 1 origin_tech = "materials=1;biotech=1" @@ -16,7 +16,7 @@ icon_state = "hemostat" materials = list(MAT_METAL=5000, MAT_GLASS=2500) flags = CONDUCT - w_class = 1.0 + w_class = 1 origin_tech = "materials=1;biotech=1" attack_verb = list("attacked", "pinched") @@ -28,7 +28,7 @@ icon_state = "cautery" materials = list(MAT_METAL=2500, MAT_GLASS=750) flags = CONDUCT - w_class = 1.0 + w_class = 1 origin_tech = "materials=1;biotech=1" attack_verb = list("burnt") @@ -41,8 +41,8 @@ hitsound = 'sound/weapons/circsawhit.ogg' materials = list(MAT_METAL=10000, MAT_GLASS=6000) flags = CONDUCT - force = 15.0 - w_class = 3.0 + force = 15 + w_class = 3 origin_tech = "materials=1;biotech=1" attack_verb = list("drilled") @@ -52,9 +52,9 @@ icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" flags = CONDUCT - force = 10.0 - w_class = 1.0 - throwforce = 5.0 + force = 10 + w_class = 1 + throwforce = 5 throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=4000, MAT_GLASS=1000) @@ -77,9 +77,9 @@ hitsound = 'sound/weapons/circsawhit.ogg' throwhitsound = 'sound/weapons/pierce.ogg' flags = CONDUCT - force = 15.0 - w_class = 3.0 - throwforce = 9.0 + force = 15 + w_class = 3 + throwforce = 9 throw_speed = 2 throw_range = 5 materials = list(MAT_METAL=10000, MAT_GLASS=6000) @@ -92,7 +92,7 @@ desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control." icon = 'icons/obj/surgery.dmi' icon_state = "surgical_drapes" - w_class = 1.0 + w_class = 1 origin_tech = "biotech=1" attack_verb = list("slapped") diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 7f37811240a..f0ea932a678 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -4,7 +4,7 @@ var/list/GPS_list = list() desc = "Helping lost spacemen find their way through the planets since 2016." icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" - w_class = 2.0 + w_class = 2 slot_flags = SLOT_BELT origin_tech = "programming=2;engineering=2" var/gpstag = "COM0" diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 5305af689ab..798c0e70181 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -104,8 +104,8 @@ icon = 'icons/obj/telescience.dmi' icon_state = "rcs" flags = CONDUCT - force = 10.0 - throwforce = 10.0 + force = 10 + throwforce = 10 throw_speed = 2 throw_range = 5 var/rcharges = 10 diff --git a/html/changelog.html b/html/changelog.html index c7df0b67e97..f33b95916ee 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,25 @@ -->
+

13 September 2015

+

Gun Hog updated:

+ +

Iamgoofball updated:

+ +

Jordie0608 updated:

+ +

xxalpha updated:

+ +

11 September 2015

CosmicScientist updated: