crowd-control update(i guess 🤷‍♂️ )

.gitignore

@@ -44,3 +44,5 @@ code/_global_vars/sensitive.dm
 config/forumdbconfig.txt
 config/dbconfig.txt
 config/webhooks.json
+Geminus-City
+config/admins.txt

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-merlot
+theme: jekyll-theme-hacker

code/__defines/inventory_sizes.dm

@@ -1,5 +1,5 @@
 // The below should be used to define an item's w_class variable.
-// Example: w_class = ITENSIZE_LARGE
+// Example: w_class = ITEMSIZE_LARGE
 // This allows the addition of future w_classes without needing to change every file.
 #define ITEMSIZE_TINY				1
 #define ITEMSIZE_SMALL				2

code/game/machinery/vending.dm

@@ -2359,7 +2359,8 @@
 					/obj/item/weapon/storage/box/shotgunshells = 2,
 					/obj/item/weapon/storage/box/stunshells = 2,
 					/obj/item/weapon/gun/projectile/automatic/sts35 = 2,
-					/obj/item/ammo_magazine/m545 = 4
+					/obj/item/ammo_magazine/m545 = 4,
+					/obj/item/weapon/reagent_containers/spray/teargun = 3					
 					)
 
 /obj/machinery/vending/armory/gcpd/energy

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -47,6 +47,7 @@
 	desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "telebaton0"
+	item_state = "telebaton0"
 	slot_flags = SLOT_BELT
 	w_class = ITEMSIZE_SMALL
 	force = 3
@@ -59,15 +60,17 @@
 		user.visible_message("<span class='warning'>With a flick of their wrist, [user] extends their telescopic baton.</span>",\
 		"<span class='warning'>You extend the baton.</span>",\
 		"You hear an ominous click.")
-		icon_state = "telebaton1"
+		icon_state = "telebaton[on]"
+		item_state = "telebaton[on]"
 		w_class = ITEMSIZE_NORMAL
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
 	else
 		user.visible_message("<span class='notice'>\The [user] collapses their telescopic baton.</span>",\
 		"<span class='notice'>You collapse the baton.</span>",\
 		"You hear a click.")
-		icon_state = "telebaton0"
+		icon_state = "telebaton[on]"
+		item_state = "telebaton[on]"
 		w_class = ITEMSIZE_SMALL
 		force = 3//not so robust now
 		attack_verb = list("hit", "punched")

code/modules/detectivework/tools/storage.dm

@@ -49,4 +49,23 @@
 		/obj/item/weapon/csi_marker/n5 = 1,
 		/obj/item/weapon/csi_marker/n6 = 1,
 		/obj/item/weapon/csi_marker/n7 = 1
-	)
+	)
+
+/obj/item/weapon/storage/box/riot_stuff
+	name = "Riot gear"
+	desc = "placeholder."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "duffle_sec"
+
+	w_class = ITEMSIZE_NO_CONTAINER
+	starts_with = list(
+		/obj/item/clothing/head/helmet/riot,
+		/obj/item/clothing/suit/armor/riot,
+		/obj/item/clothing/gloves/arm_guard/riot,
+		/obj/item/clothing/shoes/leg_guard/riot,
+        /obj/item/weapon/shield/riot/tele,
+        /obj/item/weapon/storage/box/teargas,
+       	/obj/item/weapon/melee/telebaton,
+		/obj/item/clothing/mask/gas/commando,
+		/obj/item/weapon/reagent_containers/spray/pepper
+	)

code/modules/mob/mob.dm

@@ -685,8 +685,11 @@
 
 	if(.)
 		if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)
+			stat("Security Level:", get_security_level())
+			stat(" ")
 			stat("Current Time", stationtime2text())
 			stat("Current Date", stationdate2text())
+			stat(" ")
 			stat("Round Duration", roundduration2text())
 			stat("Round Persistence:", "[config.canonicity ? "Canon" : "Non-Canon"]")
 			stat("Game ID:", "[game_id]")

code/modules/projectiles/guns/launcher/grenade_launcher.dm

@@ -101,6 +101,9 @@
 /obj/item/weapon/gun/launcher/grenade/underslung/attack_self()
 	return
 
+
+
+
 //load and unload directly into chambered
 /obj/item/weapon/gun/launcher/grenade/underslung/load(obj/item/weapon/grenade/G, mob/user)
 	if(G.loadable)

code/modules/reagents/reagent_containers/spray.dm

@@ -136,6 +136,23 @@
 		return
 	..()
 
+
+/obj/item/weapon/reagent_containers/spray/teargun
+	name ="Tear gas gun"
+	desc = "Most effective crowd-control device in the galaxy"
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "chemsprayer"
+	item_state = "chemsprayer"
+	w_class = ITEMSIZE_LARGE
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = null
+	volume = 500
+	matter = list(DEFAULT_WALL_MATERIAL = 4000)
+
+/obj/item/weapon/reagent_containers/spray/teargun/New()
+	..()
+	reagents.add_reagent("condensedcapsaicin", 500)
+
 /obj/item/weapon/reagent_containers/spray/waterflower
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."

config/admins.txt

@@ -12,9 +12,10 @@
 # n8toe - Developer
 
 
+FighterOfKeyboard - Host
 silene - Host
 TolinKalin - Host
 jsuelieta - Game Admin
 vlad777 - Developer
 AnnoyingIncantation - Moderator
-Desminus - Moderator
+Desminus - Moderator

config/hardwhitelist.txt

@@ -6,7 +6,7 @@ silene - Medical Director
 silene - Research Director
 silene - Judge
 silene - District Prosecutor
-silene - Nanotrasen CEO
+fighterofkeyboard - Nanotrasen CEO
 silene - Police Officer
 silene - Detective
 silene - Prison Warden