Merge branch 'master' of https://github.com/goonstation/goonstation

Retrino · Jun 25, 2024 · ed34e67 · ed34e67
2 parents 3b0a5e0 + 675868b
commit ed34e67
Show file tree

Hide file tree

Showing 8 changed files with 2,574 additions and 1,934 deletions.
diff --git a/browserassets/html/motd.html b/browserassets/html/motd.html
@@ -19,7 +19,7 @@ <h2>Welcome!</h2>
 
 <h2>Rules</h2>
 <div>
-	<strong class="alert"><a href="https://wiki.ss13.co/Rules">Read the rules!</a> We have zero tolerance for sexual content, racism, bigotry, or slurs. If an admin tells you to stop doing something, <em>stop doing it</em>.</strong> (Update 06/17/2024: New rule about overusing memes, see full rules page.)
+	<strong class="alert"><a href="https://wiki.ss13.co/Rules">Read the rules!</a> We have zero tolerance for sexual content, racism, bigotry, or slurs. If an admin tells you to stop doing something, <em>stop doing it</em>.</strong> (Update 06/25/2024: New rules about overusing memes and powergaming; see full rules page.)
 	<br><em style="color: #666; font-size: 75%;"><strong>Disclaimer:</strong> By playing here, you accept that you may be toolboxed, bombed, burned, gibbed, or farted on at any time for someone's amusement.</em>
 </div>
 <br><strong>Enjoy the game!</strong>
diff --git a/code/map.dm b/code/map.dm
@@ -1003,6 +1003,10 @@ var/global/list/mapNames = list(
 	window_layer_south = FLY_LAYER+1
 	auto_windows = TRUE
 
+	merchant_left_centcom = /area/shuttle/merchant_shuttle/left_centcom/cogmap
+	merchant_left_station = /area/shuttle/merchant_shuttle/left_station/cogmap
+	merchant_right_centcom = /area/shuttle/merchant_shuttle/right_centcom/cogmap
+	merchant_right_station = /area/shuttle/merchant_shuttle/right_station/cogmap
 	escape_dir = EAST
 
 /datum/map_settings/trunkmap

diff --git a/code/obj/sawflymisc.dm b/code/obj/sawflymisc.dm
@@ -52,7 +52,8 @@ TYPEINFO(/obj/item/old_grenade/sawfly)
 			heldfly.ai = new /datum/aiHolder/aggressive(heldfly)
 
 		qdel(src)
-/obj/item/old_grenade/sawfly/firsttime//super important- traitor uplinks and sawfly pouches use this specific version
+
+/obj/item/old_grenade/sawfly/firsttime //super important- traitor uplinks and sawfly pouches use this specific version
 	New()
 
 		heldfly = new /mob/living/critter/robotic/sawfly(src.loc)
@@ -61,6 +62,7 @@ TYPEINFO(/obj/item/old_grenade/sawfly)
 		..()
 
 /obj/item/old_grenade/sawfly/firsttime/withremote // for traitor menu
+	mechanics_type_override = /obj/item/old_grenade/sawfly/firsttime //prevents remote clutter if you're making an army
 	New()
 		new /obj/item/remote/sawflyremote(src.loc)
 		..()
@@ -94,7 +96,8 @@ TYPEINFO(/obj/item/old_grenade/sawfly)
 			icon_state_armed = "clusterflyB1"
 
 // -------------------controller---------------
-
+TYPEINFO(/obj/item/old_grenade/sawfly)
+	mats = list("CON-1"=2)
 /obj/item/remote/sawflyremote
 	name = "Sawfly remote"
 	desc = "A small device that can be used to fold or deploy sawflies in range."
@@ -104,6 +107,7 @@ TYPEINFO(/obj/item/old_grenade/sawfly)
 	w_class = W_CLASS_TINY
 	flags = FPRINT | TABLEPASS
 	object_flags = NO_GHOSTCRITTER
+	is_syndicate = TRUE
 
 	HELP_MESSAGE_OVERRIDE({"Use the remote in hand to activate/deactivate any sawflies within a 5 tile radius."})
 

diff --git a/code/procs/access.dm b/code/procs/access.dm
@@ -262,7 +262,7 @@
 				access_bar, access_janitor, access_robotics, access_cargo, access_construction, access_hydro, access_mail,
 				access_engineering, access_maint_tunnels, access_external_airlocks,
 				access_tech_storage, access_engineering_storage, access_engineering_eva,
-				access_engineering_power, access_engineering_engine, access_mining_shuttle,
+				access_engineering_engine, access_mining_shuttle,
 				access_engineering_control, access_engineering_mechanic, access_mining, access_mining_outpost,
 				access_research, access_engineering_atmos, access_hangar, access_ranch, access_pathology, access_artlab, access_telesci,
 				access_researchfoyer, access_robotdepot)

diff --git a/maps/cogmap.dmm b/maps/cogmap.dmm
@@ -6988,6 +6988,7 @@
 /area/station/storage/emergency)
 "aAG" = (
 /obj/machinery/drone_recharger,
+/obj/item/storage/pill_bottle/cyberpunk,
 /turf/simulated/floor/plating,
 /area/station/maintenance/solar/west)
 "aAH" = (

diff --git a/maps/donut2.dmm b/maps/donut2.dmm
@@ -49505,6 +49505,10 @@
 	},
 /turf/simulated/floor/specialroom/cafeteria,
 /area/station/crew_quarters/kitchen)
+"wLi" = (
+/obj/item/storage/pill_bottle/cyberpunk,
+/turf/simulated/floor/plating,
+/area/station/maintenance/east)
 "wLu" = (
 /obj/cable{
 	icon_state = "4-8"
@@ -92719,7 +92723,7 @@ vvh
 beM
 beM
 beM
-beM
+wLi
 beT
 cNv
 beT