Merge branch 'master' into ghfsdhgh

shiptest-ss13 · Jan 13, 2024 · da9a100 · da9a100
2 parents 387702d + 3376971
commit da9a100
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 34 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -3387,7 +3387,7 @@
 "Zw" = (
 /obj/structure/bed,
 /obj/item/bedsheet/brown,
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/rilena/random{
 	pixel_y = 32
 	},
 /obj/structure/spider/stickyweb,

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -3034,7 +3034,7 @@
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 4
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/retro/random{
 	pixel_y = 30
 	},
 /obj/structure/table,

diff --git a/_maps/outpost/hangar/nt_asteroid_56x20.dmm b/_maps/outpost/hangar/nt_asteroid_56x20.dmm
@@ -236,7 +236,7 @@
 	pixel_x = 6;
 	pixel_y = 17
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/retro/random{
 	pixel_x = 32
 	},
 /turf/open/floor/carpet/red,

diff --git a/_maps/outpost/hangar/nt_asteroid_56x40.dmm b/_maps/outpost/hangar/nt_asteroid_56x40.dmm
@@ -1147,7 +1147,7 @@
 	pixel_x = 6;
 	pixel_y = 17
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/retro/random{
 	pixel_x = 32
 	},
 /turf/open/floor/carpet/red{

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -14154,7 +14154,7 @@
 	pixel_y = 19;
 	pixel_x = 15
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/retro/random{
 	pixel_x = 32
 	},
 /turf/open/floor/wood,

diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -4427,7 +4427,7 @@
 /area/ship/crew/cryo)
 "QA" = (
 /obj/machinery/blackbox_recorder,
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/official/moth/epi{
 	pixel_x = 32
 	},
 /obj/machinery/button/door{

diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1782,7 +1782,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/rilena/random{
 	pixel_x = 32
 	},
 /turf/open/floor/wood/walnut,

diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -829,7 +829,7 @@
 /obj/item/mop,
 /obj/item/reagent_containers/glass/bucket,
 /obj/machinery/firealarm/directional/west,
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/official/wtf_is_co2{
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -7848,7 +7848,7 @@
 /obj/effect/turf_decal/corner/opaque/mauve{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/sgt{
+/obj/structure/sign/poster/official/random{
 	pixel_x = -32
 	},
 /obj/machinery/firealarm/directional/north,

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -1010,11 +1010,14 @@
 	},
 /obj/item/reagent_containers/food/drinks/mug/coco{
 	pixel_x = 7;
-	pixel_y = 5
+	pixel_y = 12
 	},
 /obj/item/pen/fountain/solgov{
 	pixel_x = -5
 	},
+/obj/machinery/recharger{
+	pixel_x = 7
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "kF" = (
@@ -1856,15 +1859,11 @@
 	dir = 10
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
-	pixel_x = -7;
-	pixel_y = -2
-	},
-/obj/machinery/recharger,
 /obj/item/spacecash/bundle/loadsamoney{
-	pixel_x = 5;
-	pixel_y = 8
+	pixel_x = 8;
+	pixel_y = 12
 	},
+/obj/machinery/fax,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "sp" = (
@@ -3069,7 +3068,7 @@
 /area/ship/crew/canteen)
 "Eh" = (
 /obj/item/bedsheet/double/solgov{
-	dir = 8
+	dir = 4
 	},
 /obj/structure/bed/double{
 	dir = 1

diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
@@ -721,11 +721,6 @@
 	desc = "This informational poster teaches the viewer what carbon dioxide is."
 	icon_state = "poster_co2"
 
-/obj/structure/sign/poster/official/sgt
-	name = "Sapient Trafficking Awareness"
-	desc = "A poster calling for an end to sapient trafficking. Over sixty percent of victims are jellywomen."
-	icon_state = "poster_sgt" // Maybe this will be what finally fixes it.
-
 /obj/structure/sign/poster/official/focus
 	name = "Focus! Motivational Poster"
 	desc = "\"Focus! Let your energy be pinpointed!\""

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -526,17 +526,22 @@
 	if(!has_safety)
 		return
 
-	if(src == !user.get_active_held_item())
+	if(src != user.get_active_held_item())
 		return
 
-	playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+	if(isliving(user) && in_range(src, user))
+		toggle_safety(user)
+
+/obj/item/gun/proc/toggle_safety(mob/user, silent=FALSE)
 	safety = !safety
 
-	user.visible_message(
-		span_notice("[user] turns the safety on [src] [safety ? "<span class='green'>ON</span>" : "<span class='red'>OFF</span>"]."),
-		span_notice("You turn the safety on [src] [safety ? "<span class='green'>ON</span>" : "<span class='red'>OFF</span>"]."),
-		vision_distance = COMBAT_MESSAGE_RANGE
-	)
+	if(!silent)
+		playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+		user.visible_message(
+			span_notice("[user] turns the safety on [src] [safety ? "<span class='green'>ON</span>" : "<span class='red'>OFF</span>"]."),
+			span_notice("You turn the safety on [src] [safety ? "<span class='green'>ON</span>" : "<span class='red'>OFF</span>"]."),
+		)
+
 	update_appearance()
 
 

diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
@@ -101,7 +101,7 @@
 		return
 	if (!magazine)
 		magazine = new mag_type(src)
-	chamber_round(TRUE)
+	chamber_round()
 	update_appearance()
 
 /obj/item/gun/ballistic/update_icon_state()

diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -255,9 +255,10 @@
 		return ..()
 
 /obj/item/gun/ballistic/automatic/assault/e40/attackby(obj/item/attack_obj, mob/user, params)
-	if(istype(attack_obj, /obj/item/stock_parts/cell/gun) || istype(attack_obj, /obj/item/screwdriver))
-		secondary.attack_self()
+	if(istype(attack_obj, /obj/item/stock_parts/cell/gun))
 		secondary.attackby(attack_obj, user, params)
+	if(istype(attack_obj, /obj/item/screwdriver))
+		secondary.screwdriver_act(user, attack_obj,)
 	else
 		..()
 
@@ -303,6 +304,12 @@
 	update_icon()
 	return
 
+
+
+/obj/item/gun/ballistic/automatic/assault/e40/toggle_safety(mob/user, silent=FALSE)
+	. = ..()
+	secondary.toggle_safety(user, silent=TRUE)
+
 //laser
 
 /obj/item/gun/energy/laser/e40_laser_secondary

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -176,6 +176,7 @@
 	special_mags = TRUE
 	semi_auto = TRUE
 	internal_magazine = FALSE
+	casing_ejector = TRUE
 	tac_reloads = TRUE
 	pickup_sound =  'sound/items/handling/rifle_pickup.ogg'
 	manufacturer = MANUFACTURER_SCARBOROUGH

diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml
@@ -28,3 +28,18 @@
   - bugfix: Fixes a bunch of cases of windows not being where they were supposed to
       be, tables/chairs stacking on each other, and other very small stuff you've
       never noticed before.
+2024-01-12:
+  PositiveEntropy:
+  - imageadd: The Gorlex 2nd Battlegroup clothing sprites have been updated!
+  tiramisuapimancer:
+  - rscdel: Removed the edgy human trafficking/SGT joke poster
+2024-01-13:
+  FleetingExpertise:
+  - bugfix: The 'phantom round' bug with guns has been fixed
+  - bugfix: Ghosts can no longer toggle gun safety
+  - bugfix: Bulldogs no longer destroy shotgun shells from existence
+  - bugfix: Bows should no longer randomly break
+  - bugfix: A lot of jank involving the E-40 has been fixed
+  Zevotech:
+  - rscadd: adds a fax machine to the paracelsus-class
+  - bugfix: rotates a bedsheet on the paracelsus class to be the right direction
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -5,7 +5,7 @@ Pillow==10.0.1
 # check_regex.py
 colorama==0.4.4
 PyYaml==6.0
-gitpython==3.1.37
+gitpython==3.1.41
 unidiff==0.7.0
 
 # changelogs