Modularize and table flip (#4182)

Monkestation · Nov 11, 2024 · b842b6a · b842b6a
1 parent fba9da8
commit b842b6a
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 86 deletions.
diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm
@@ -24,8 +24,6 @@
 #define CALIBER_38 ".38"
 /// The caliber used by the chaplain's revolver.
 #define CALIBER_77 ".77"
-/// The caliber used by long revolver and long rifle
-#define CALIBER_45L ".45l"
 /// The caliber used by the C-20r SMG, the tommygun, and the M1911 pistol.
 #define CALIBER_45 ".45"
 /// The caliber used by sniper rifles and the desert eagle.

diff --git a/code/__DEFINES/~monkestation/projectiles.dm b/code/__DEFINES/~monkestation/projectiles.dm
@@ -26,6 +26,9 @@
 /// Caliber used by the pepperball gun
 #define CALIBER_PEPPERBALL "pepperball"
 
+/// The caliber used by long revolver and long rifle
+#define CALIBER_45L ".45l"
+
 // open to suggestions on where to put these overrides
 // hugely not a fan of this but we do what we gotta
 

diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -56,17 +56,3 @@
 	name = ".38 Iceblox bullet casing"
 	desc = "A .38 Iceblox bullet casing."
 	projectile_type = /obj/projectile/bullet/c38/iceblox
-
-// .45 (Lever Rifle and Long Revolver)
-
-/obj/item/ammo_casing/g45l
-	name = ".45 Long bullet casing "
-	desc = "A .45 Long bullet casing."
-	caliber = CALIBER_45L
-	projectile_type = /obj/projectile/bullet/g45l
-
-/obj/item/ammo_casing/g45l/rubber
-	name = ".45 Long rubber bullet casing"
-	desc = "A .45 Long rubber bullet casing."
-	caliber = CALIBER_45L
-	projectile_type = /obj/projectile/bullet/g45l/rubber
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -55,20 +55,6 @@
 	desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
 	ammo_type = /obj/item/ammo_casing/c38/iceblox
 
-/obj/item/ammo_box/g45l
-	name = "ammo box (.45 Long Lethal)"
-	desc = "This box contains .45 Long lethal cartridges."
-	ammo_type = /obj/item/ammo_casing/g45l
-	icon_state = "45box"
-	max_ammo = 24
-
-/obj/item/ammo_box/g45l/rubber
-	name = "ammo box (.45 Long Rubber)"
-	desc = "Brought to you at great expense,this box contains .45 Long rubber cartridges."
-	icon_state = "45box"
-	ammo_type = /obj/item/ammo_casing/g45l/rubber
-	max_ammo = 24
-
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -20,9 +20,3 @@
 /obj/item/ammo_box/magazine/internal/rus357/Initialize(mapload)
 	stored_ammo += new ammo_type(src)
 	. = ..()
-
-/obj/item/ammo_box/magazine/internal/cylinder/rev45l
-	name = ".45 Long revolver cylinder"
-	ammo_type = /obj/item/ammo_casing/g45l
-	caliber = CALIBER_45L
-	max_ammo = 6
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -162,18 +162,6 @@
 
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
 
-/obj/item/gun/ballistic/revolver/r45l
-	name = "\improper .45 Long Revolver"
-	desc = "A cheap .45 Long Revolver. Pray the timing keeps."
-	icon_state = "45revolver"
-	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45l
-	obj_flags = UNIQUE_RENAME
-
-	unique_reskin = list("Default" = "45revolver",
-						"Cowboy" = "357colt",
-						"Lucky" = "lucky" //Well do ya?
-						)
-
 // A gun to play Russian Roulette!
 // You can spin the chamber to randomize the position of the bullet.
 

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -344,22 +344,3 @@
 	hook.afterattack(target, user, proximity_flag, click_parameters)
 	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
-// Lever gun
-/obj/item/gun/ballistic/shotgun/leveraction
-	name = "brush gun"
-	desc = "While lever-actions have been horribly out of date for hundreds of years now, \
-	putting a nicely sized hole in a man-sized target with a .45 Long round has stayed relatively timeless."
-	icon_state = "brushgun"
-	bolt_wording = "Lever"
-	cartridge_wording = "bullet"
-	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/levergun
-	projectile_wound_bonus = 10
-	projectile_damage_multiplier = 1.1
-	w_class = WEIGHT_CLASS_BULKY
-	force = 10
-	flags_1 = CONDUCT_1
-	semi_auto = FALSE
-	internal_magazine = TRUE
-	casing_ejector = FALSE
-	weapon_weight = WEAPON_HEAVY
-
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -128,20 +128,3 @@
 	ricochet_auto_aim_range = 6
 	ricochet_incidence_leeway = 80
 	ricochet_decay_chance = 1
-
-// .45 (Lever Rifle and Long Revolver)
-
-/obj/projectile/bullet/g45l/rubber
-	name = ".45 Long rubber bullet"
-	damage = 5
-	stamina = 35
-	weak_against_armour = TRUE
-	sharpness = NONE
-	embedding = null
-
-/obj/projectile/bullet/g45l
-	name = ".45 Long bullet"
-	damage = 35
-	wound_bonus = -5
-	sharpness = SHARP_EDGED
-	embedding = list(embed_chance=25, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=1 SECONDS)
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
diff --git a/monkestation/code/game/objects/items/guns/long_guns.dm b/monkestation/code/game/objects/items/guns/long_guns.dm
@@ -0,0 +1,85 @@
+// Lever gun
+/obj/item/gun/ballistic/shotgun/leveraction
+	name = "brush gun"
+	desc = "While lever-actions have been horribly out of date for hundreds of years now, \
+	putting a nicely sized hole in a man-sized target with a .45 Long round has stayed relatively timeless."
+	icon_state = "brushgun"
+	icon = 'monkestation/icons/obj/guns/guns.dmi'
+	bolt_wording = "Lever"
+	cartridge_wording = "bullet"
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/levergun
+	projectile_wound_bonus = 10
+	projectile_damage_multiplier = 1.1
+	w_class = WEIGHT_CLASS_BULKY
+	force = 10
+	flags_1 = CONDUCT_1
+	semi_auto = FALSE
+	internal_magazine = TRUE
+	casing_ejector = FALSE
+	weapon_weight = WEAPON_HEAVY
+	pb_knockback = 0
+
+// Revolver
+/obj/item/gun/ballistic/revolver/r45l
+	name = "\improper .45 Long Revolver"
+	desc = "A cheap .45 Long Revolver. Pray the timing keeps."
+	icon_state = "45revolver"
+	icon = 'monkestation/icons/obj/guns/guns.dmi'
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45l
+	obj_flags = UNIQUE_RENAME
+
+	unique_reskin = list("Default" = "45revolver",
+						"Cowboy" = "357colt",
+						"Lucky" = "lucky" //Well do ya?
+						)
+
+// .45 (Lever Rifle and Long Revolver)
+
+/obj/projectile/bullet/g45l/rubber
+	name = ".45 Long rubber bullet"
+	damage = 5
+	stamina = 35
+	weak_against_armour = TRUE
+	sharpness = NONE
+	embedding = null
+
+/obj/projectile/bullet/g45l
+	name = ".45 Long bullet"
+	damage = 35
+	wound_bonus = -5
+	sharpness = SHARP_EDGED
+	embedding = list(embed_chance=25, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=1 SECONDS)
+
+// .45 (Lever Rifle and Long Revolver)
+
+/obj/item/ammo_casing/g45l
+	name = ".45 Long bullet casing "
+	desc = "A .45 Long bullet casing."
+	caliber = CALIBER_45L
+	projectile_type = /obj/projectile/bullet/g45l
+
+/obj/item/ammo_casing/g45l/rubber
+	name = ".45 Long rubber bullet casing"
+	desc = "A .45 Long rubber bullet casing."
+	caliber = CALIBER_45L
+	projectile_type = /obj/projectile/bullet/g45l/rubber
+
+/obj/item/ammo_box/g45l
+	name = "ammo box (.45 Long Lethal)"
+	desc = "This box contains .45 Long lethal cartridges."
+	ammo_type = /obj/item/ammo_casing/g45l
+	icon_state = "45box"
+	max_ammo = 24
+
+/obj/item/ammo_box/g45l/rubber
+	name = "ammo box (.45 Long Rubber)"
+	desc = "Brought to you at great expense,this box contains .45 Long rubber cartridges."
+	icon_state = "45box"
+	ammo_type = /obj/item/ammo_casing/g45l/rubber
+	max_ammo = 24
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev45l
+	name = ".45 Long revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/g45l
+	caliber = CALIBER_45L
+	max_ammo = 6
diff --git a/monkestation/code/modules/blueshift/structures/flipped_table.dm b/monkestation/code/modules/blueshift/structures/flipped_table.dm
@@ -49,7 +49,11 @@
 
 /obj/structure/flippedtable/CtrlShiftClick(mob/user)
 	if(!istype(user) || iscorticalborer(user))
-		return FALSE
+		return
+	if(isobserver(user) && !is_admin(user.client))  //prevent ghosts from unflipping tables but still allows admins to fuck around
+		return
+	if(!user.CanReach(src))
+		return
 	user.balloon_alert_to_viewers("flipping table upright...")
 	if(do_after(user, max_integrity * 0.25))
 		var/obj/structure/table/unflipped_table = new table_type(src.loc)

diff --git a/monkestation/code/modules/cargo/crates/imports.dm b/monkestation/code/modules/cargo/crates/imports.dm
@@ -55,7 +55,7 @@
 	access_view = ACCESS_ARMORY
 	crate_type = /obj/structure/closet/crate/secure/weapon
 
-
+// MONKESTATION ADDITION START
 /datum/supply_pack/imports/Lrevolvercrate
 	name = "Long Revolver Crate"
 	desc = "We got these old revolvers from a unnamed man, enjoy them"
@@ -83,3 +83,4 @@
 	access = ACCESS_ARMORY
 	access_view = ACCESS_ARMORY
 	crate_type = /obj/structure/closet/crate/secure/weapon
+// MONKESTATION ADDITION END
diff --git a/monkestation/icons/obj/guns/guns.dmi b/monkestation/icons/obj/guns/guns.dmi
diff --git a/tgstation.dme b/tgstation.dme
@@ -5982,6 +5982,7 @@
 #include "monkestation\code\game\objects\items\granters\maintenanceencyclopedia.dm"
 #include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm"
 #include "monkestation\code\game\objects\items\guns\crank_guns.dm"
+#include "monkestation\code\game\objects\items\guns\long_guns.dm"
 #include "monkestation\code\game\objects\items\guns\shotguns.dm"
 #include "monkestation\code\game\objects\items\guns\SRN.dm"
 #include "monkestation\code\game\objects\items\guns\wt_ammo.dm"