Skip to content

Commit

Permalink
set 1 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilitiaEnnehrt committed Sep 4, 2024
1 parent ee2f341 commit 477b2b2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions code/game/objects/structures/watercloset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/obj/structure/toilet
name = "toilet"
desc = "A HT-451 toilet. A torque rotation-based waste disposal unit for small matter."
desc = "An HT-451 toilet. A torque rotation-based waste disposal unit for small matter."
icon = 'icons/obj/watercloset.dmi'
icon_state = "toilet00"
density = 0
Expand Down Expand Up @@ -121,7 +121,7 @@

/obj/structure/urinal
name = "urinal"
desc = "A HU-452 urinal. Don't stand too far away."
desc = "An HU-452 urinal. Don't stand too far away."
icon = 'icons/obj/watercloset.dmi'
icon_state = "urinal"
density = 0
Expand Down Expand Up @@ -157,7 +157,7 @@

/obj/machinery/shower
name = "shower"
desc = "A HS-451 shower unit. Has a bolted temperature dial."
desc = "An HS-451 shower unit. Has a bolted temperature dial."
icon = 'icons/obj/watercloset.dmi'
icon_state = "shower"
density = 0
Expand Down Expand Up @@ -420,7 +420,7 @@
name = "sink"
icon = 'icons/obj/watercloset.dmi'
icon_state = "sink"
desc = "A HV-11 sink used for washing hands and face."
desc = "An HV-11 sink used for washing hands and face."
anchored = 1
reagent_flags = OPENCONTAINER
var/busy = 0 //Something's being washed at the moment
Expand Down Expand Up @@ -602,7 +602,7 @@

/obj/structure/sink/kitchen
name = "kitchen sink"
desc = "A HV-11B sink. Used for washing the hands and face, and utensils."
desc = "An HV-11B sink. Used for washing the hands and face, and utensils."
icon_state = "sink_alt"

/obj/structure/sink/puddle //splishy splashy ^_^
Expand Down
20 changes: 10 additions & 10 deletions code/modules/projectiles/ammunition/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
//// 8.6mm heavy rifle////

/obj/item/ammo_casing/heavy_rifle_408
desc = "A 8.6mm bullet casing."
desc = "An 8.6mm bullet casing."
icon_state = "lrifle_c_l"
spent_icon = "lrifle_c_l-spent"
shell_color = "l"
Expand All @@ -297,32 +297,32 @@
amount = 10

/obj/item/ammo_casing/heavy_rifle_408/rubber
desc = "A 8.6mm rubber bullet casing."
desc = "An 8.6mm rubber bullet casing."
icon_state = "lrifle_c_r"
spent_icon = "lrifle_c_r-spent"
shell_color = "r"
projectile_type = /obj/item/projectile/bullet/heavy_rifle_408/rubber

/obj/item/ammo_casing/heavy_rifle_408/practice
desc = "A 8.6mm training bullet casing."
desc = "An 8.6mm training bullet casing."
icon_state = "lrifle_c_p"
spent_icon = "lrifle_c_p-spent"
shell_color = "p"
projectile_type = /obj/item/projectile/bullet/heavy_rifle_408/practice

/obj/item/ammo_casing/heavy_rifle_408/hv
desc = "A 8.6mm high-velocity SLAP bullet casing."
desc = "An 8.6mm high-velocity SLAP bullet casing."
icon_state = "lrifle_c_hv"
spent_icon = "lrifle_c_hv-spent"
shell_color = "hv"
projectile_type = /obj/item/projectile/bullet/heavy_rifle_408/hv

/obj/item/ammo_casing/heavy_rifle_408/lethal
desc = "A 8.6mm bullet casing."
desc = "An 8.6mm bullet casing."
projectile_type = /obj/item/projectile/bullet/heavy_rifle_408/lethal

/obj/item/ammo_casing/heavy_rifle_408/incend
desc = "A 8.6mm incendiary bullet casing."
desc = "An 8.6mm incendiary bullet casing."
shell_color = "l"
projectile_type = /obj/item/projectile/bullet/heavy_rifle_408/incend

Expand All @@ -340,7 +340,7 @@
amount = 10

/obj/item/ammo_casing/heavy_rifle_408/laser
desc = "A 8.6mm laser casing."
desc = "An 8.6mm laser casing."
projectile_type = /obj/item/projectile/beam/weak/heavy_rifle_408

/obj/item/ammo_casing/heavy_rifle_408/spent
Expand Down Expand Up @@ -495,7 +495,7 @@

/obj/item/ammo_casing/antim/lethal
name = "\"Red-Nose\" shell casing"
desc = "A SA 14.5mm Anti-Materiel \"Red-Nose\" shell, punches organics harder than the standard round."
desc = "An SA 14.5mm Anti-Materiel \"Red-Nose\" shell, punches organics harder than the standard round."
icon_state = "atmr_red"
spent_icon = "atmr_red-spent"
projectile_type = /obj/item/projectile/bullet/antim/lethal
Expand All @@ -505,7 +505,7 @@

/obj/item/ammo_casing/antim/ion
name = "\"Off-Switch\" shell casing"
desc = "A SA 14.5mm Anti-Materiel \"Off-Switch\" Ion shell, causes EMP burst on impact."
desc = "An SA 14.5mm Anti-Materiel \"Off-Switch\" Ion shell, causes EMP burst on impact."
icon_state = "atmr_red"
spent_icon = "atmr_red-spent"
projectile_type = /obj/item/projectile/bullet/antim/ion
Expand All @@ -515,7 +515,7 @@

/obj/item/ammo_casing/antim/incend
name = "\"Willy Pete\" shell casing"
desc = "A SA 14.5mm Anti-Materiel \"Willy Pete\" White Phosphorous incendiary round."
desc = "An SA 14.5mm Anti-Materiel \"Willy Pete\" White Phosphorous incendiary round."
shell_color = "atmr_red"
spent_icon = "atmr_red-spent"
projectile_type = /obj/item/projectile/bullet/antim/incend
Expand Down

0 comments on commit 477b2b2

Please sign in to comment.