cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Typos and Cigarette Fixes (#20878)

Browse Source 
this PR fixes some typos and increases the S'rendarr's Hand content in
the adhomian cigarette from 5 to 10 to match the total amount found in
other cigarettes. also removes "vanilla cigarettes" from the code
because it isn't used anywhere.
This commit is contained in:
SleepyGemmy
2025-06-25 21:10:02 +00:00
committed by GitHub
parent 5f9201fdf0
commit ea2a6b1204
7 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+2 -5
View File
@@ -374,9 +374,6 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
return ..()
/obj/item/clothing/mask/smokable/cigarette/vanilla
reagents_to_add = list(/singleton/reagent/toxin/tobacco = 15)
/obj/item/clothing/mask/smokable/cigarette/acmeco
reagents_to_add = list(
/singleton/reagent/toxin/tobacco = 5,
@@ -411,7 +408,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
name = "adhomian cigarette"
desc = "An adhomian cigarette made from processed S'rendarr's Hand."
reagents_to_add = list(
/singleton/reagent/toxin/tobacco/srendarrs_hand = 5,
/singleton/reagent/toxin/tobacco/srendarrs_hand = 10,
/singleton/reagent/mental/nicotine = 5
)
@@ -431,7 +428,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
)
/obj/item/clothing/mask/smokable/cigarette/dyn
name = "dyn cigarette"
name = "dyn cigarette"
desc = "A mentholated cigarette from Nralakk made with processed dyn."
reagents_to_add = list(
/singleton/reagent/toxin/tobacco/sweet = 5,
code/game/objects/items/weapons/tools.dm
+5 -7
View File
@@ -715,7 +715,7 @@
icon_state = "crowbar_red"
item_state = "crowbar_red"
/obj/item/crowbar/rescue_axe //Imagine something like a crash axe found on airplanes or forcing tools used by emergency services. This is a tool first and foremost.
/obj/item/crowbar/rescue_axe // Imagine something like a crash axe found on airplanes or forcing tools used by emergency services. This is a tool first and foremost.
name = "rescue axe"
desc = "A short lightweight emergency tool meant to chop, pry and pierce. Most of the handle is insulated excepting the wedge at the very bottom. The axe head atop the tool has a short pick opposite of the blade."
icon_state = "rescue_axe"
@@ -723,19 +723,19 @@
w_class = WEIGHT_CLASS_NORMAL
force = 18
throwforce = 12
obj_flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you.
obj_flags = null // Handle is insulated, so this means it won't conduct electricity and hurt you.
sharp = TRUE
edge = TRUE
origin_tech = list(TECH_ENGINEERING = 2)
/obj/item/crowbar/rescue_axe/resolve_attackby(atom/A)//In practice this means it just does full damage to reinforced windows, which halve the force of attacks done against it already. That's just fine.
/obj/item/crowbar/rescue_axe/resolve_attackby(atom/A) // In practice this means it just does full damage to reinforced windows, which halve the force of attacks done against it already. That's just fine.
if(istype(A, /obj/structure/window))
force = initial(force) * 2
else
force = initial(force)
. = ..()
/obj/item/crowbar/rescue_axe/iscrowbar()//go ham
/obj/item/crowbar/rescue_axe/iscrowbar()
if(ismob(loc))
var/mob/M = loc
if(M.a_intent && M.a_intent == I_HURT)
@@ -751,7 +751,7 @@
item_state = "rescue_axe_red"
/obj/item/crowbar/hydraulic_rescue_tool
name = "Hydraulic rescue tool"
name = "hydraulic rescue tool"
desc = "A hydraulic rescue tool that functions like a crowbar by applying strong amounts of hydraulic pressure to force open different things. Also known as jaws of life."
icon = 'icons/obj/item/hydraulic_rescue_tool.dmi'
icon_state = "jawspry"
@@ -764,8 +764,6 @@
origin_tech = list(TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("attacked", "rammed", "battered", "bludgeoned")
sharp = FALSE
edge = FALSE
// Pipe wrench
/obj/item/pipewrench