Merge pull request #2 from Aurorastation/master

Fork update.

code/game/gamemodes/factions.dm

@@ -125,6 +125,7 @@
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
 /obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
+/obj/item/weapon/melee/baton/stunrod:4:Stunrod;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/pen/paralysis:3:Paralysis Pen;

code/game/gamemodes/game_mode.dm

@@ -37,6 +37,7 @@
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
 /obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
+/obj/item/weapon/melee/baton/stunrod:4:Stunrod;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/storage/box/walkingcane:5:Disguised Sword;

code/game/objects/items/devices/uplinks.dm

@@ -147,6 +147,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 		randomItems.Add("/obj/item/weapon/melee/energy/sword") //Energy Sword
 		randomItems.Add("/obj/item/clothing/mask/gas/voice") //Voice Changer
 		randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector
+		randomItems.Add("/obj/item/weapon/melee/baton/stunrod") //Stunrod
 
 	if(uses > 2)
 		randomItems.Add("/obj/item/weapon/storage/box/emps") //EMP Grenades
@@ -197,7 +198,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 				uses -= 6
 			if("/obj/item/weapon/gun/energy/crossbow" , "/obj/item/device/powersink" , "/obj/item/weapon/storage/box/walkingcane")
 				uses -= 5
-			if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon")
+			if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon" , "/obj/item/weapon/melee/baton/stunrod")
 				uses -= 4
 			if("/obj/item/weapon/storage/box/emps" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \
 			"/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/box/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \
@@ -275,6 +276,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			feedback_add_details("traitor_uplink_items_bought","GM")
 		if("/obj/item/weapon/storage/box/syndie_kit/masks")
 			feedback_add_details("traitor_uplink_items_bought","MM")
+		if("/obj/item/weapon/melee/baton/stunrod")
+			feedback_add_details("traitor_uplink_items_bought","SR")
 
 
 

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

@@ -138,7 +138,7 @@
 
 /obj/item/weapon/melee/baton/stunrod
 	name = "stun rod"
-	desc = "A less-than-lethal weapon used to deal with high threat situations."
+	desc = "A more-than-lethal weapon used to deal with high threat situations."
 	icon_state = "stunrod"
 	item_state = "stunrod"
 	flags = FPRINT | TABLEPASS
@@ -147,7 +147,7 @@
 	throwforce = 8
 	w_class = 3
 
-	origin_tech = "combat=4"
+	origin_tech = "combat=4,illegal=2"
 
 	suicide_act(mob/user)
 		viewers(user) << "\red <b>[user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide.</b>"
@@ -165,7 +165,6 @@
 	if(status && (CLUMSY in user.mutations) && prob(50))
 		user << "\red You grab the [src] on the wrong side and burn yourself."
 		user.Weaken(40)
-//		user.damage(10,BURN,"chest")
 		charges--
 		if(charges < 1)
 			status = 0
@@ -184,7 +183,7 @@
 /obj/item/weapon/melee/baton/stunrod/attack(mob/M as mob, mob/user as mob)
 	if(status && (CLUMSY in user.mutations) && prob(50))
 		user << "<span class='danger'>You accidentally hit yourself with the [src]!</span>"
-		user.Weaken(40)
+		user.Weaken(20)
 //		user.apply_damage(10,BURN)
 		charges--
 		if(charges < 1)
@@ -199,8 +198,8 @@
 
 	if(user.a_intent == "hurt")
 		if(!..()) return
-		//H.apply_effect(5, WEAKEN, 0)
-		H.apply_damage(10, BURN)
+		H.apply_effect(5, WEAKEN, 0)
+		H.apply_damage(15, BURN)
 		H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
 
 		user.attack_log += "\[[time_stamp()]\]<font color='red'> Beat [H.name] ([H.ckey]) with [src.name]</font>"
@@ -213,9 +212,10 @@
 		return
 
 	if(status)
-		H.apply_effect(20, STUN, 0)
-		H.apply_effect(20, WEAKEN, 0)
-		H.apply_effect(20, STUTTER, 0)
+		H.apply_effect(5, STUN, 0)
+		H.apply_effect(5, WEAKEN, 0)
+		H.apply_effect(5, STUTTER, 0)
+		H.apply_damage(15, BURN)
 		user.lastattacked = M
 		H.lastattacker = user
 		if(isrobot(src.loc))
@@ -243,9 +243,10 @@
 		if(istype(hit_atom, /mob/living))
 			var/mob/living/carbon/human/H = hit_atom
 			if(status)
-				H.apply_effect(20, STUN, 0)
-				H.apply_effect(20, WEAKEN, 0)
-				H.apply_effect(20, STUTTER, 0)
+				H.apply_effect(5, STUN, 0)
+				H.apply_effect(5, WEAKEN, 0)
+				H.apply_effect(5, STUTTER, 0)
+				H.apply_damage(15, BURN)
 				charges--
 
 				for(var/mob/M in player_list) if(M.key == src.fingerprintslast)

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -3,6 +3,7 @@
  *		Bartender
  *		Janitor
  *		Lawyer
+ *		ERT
  */
 
 /*
@@ -73,4 +74,20 @@
 	new /obj/item/clothing/under/lawyer/purpsuit(src)
 	new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+
+/*
+ * ERT
+ */
+/obj/structure/closet/ertcloset
+	name = "Response Team Locker"
+	desc = "It's a storage unit for Response Team Clothing."
+	icon_state = "ertclosed"
+	icon_closed = "ertclosed"
+	icon_opened = "ertopen"
+
+/obj/structure/closet/ertcloset/New()
+	new /obj/item/clothing/mask/balaclava(src)
+	new /obj/item/clothing/gloves/combat(src)
+	new /obj/item/clothing/shoes/combat(src)
+	new /obj/item/device/radio/headset/ert(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -166,7 +166,7 @@
 
 /obj/structure/closet/secure_closet/security
 	name = "Security Officer's Locker"
-	req_access = list(access_security)
+	req_access = list(access_brig)
 	icon_state = "sec1"
 	icon_closed = "sec"
 	icon_locked = "sec1"

code/modules/clothing/under/ties.dm

@@ -294,11 +294,21 @@
 /obj/item/weapon/storage/box/holobadge
 	name = "holobadge box"
 	desc = "A box claiming to contain holobadges."
+	storage_slots = 10
+	max_w_class = 2
+	max_combined_w_class = 20
+	can_hold = list(
+		"/obj/item/clothing/tie/holobadge",
+		"/obj/item/clothing/tie/holobadge/cord")
 	New()
 		new /obj/item/clothing/tie/holobadge(src)
 		new /obj/item/clothing/tie/holobadge(src)
 		new /obj/item/clothing/tie/holobadge(src)
 		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge/cord(src)
 		new /obj/item/clothing/tie/holobadge/cord(src)
 		new /obj/item/clothing/tie/holobadge/cord(src)
 		..()

code/modules/reagents/Chemistry-Reagents.dm

@@ -1623,8 +1623,8 @@ datum
 				M.sleeping += 1
 				..()
 				return
-				
-		toxin/destabilizer 
+
+		toxin/destabilizer
 			name = "Genetic Destabilizer"
 			id = "destabilizer"
 			description = "Causes severe damage to genetic data."
@@ -1637,8 +1637,8 @@ datum
 				M.adjustCloneLoss(6) //High but still knocks out slower than mutagen.
 				..()
 				return
-				
-				
+
+
 		chefspecial
 			// Quiet and lethal, needs atleast 4 units in the person before they'll die
 			name = "Chef's Special"
@@ -1783,16 +1783,17 @@ datum
 				if(!M) M = holder.my_atom
 				if(!data) data = 1
 				switch(data)
-					if(1 to 12)
-						if(prob(5))	M.emote("yawn")
-					if(12 to 15)
+					if(1 to 5)
+						if(prob(20))	M.emote("yawn")
+					if(5 to 10)
 						M.eye_blurry = max(M.eye_blurry, 10)
-					if(15 to 49)
-						if(prob(50))
+					if(10 to 15)
+						if(prob(25))
 							M.Weaken(2)
 						M.drowsyness  = max(M.drowsyness, 20)
-					if(50 to INFINITY)
-						M.Weaken(20)
+					if(15 to INFINITY)
+						if(prob(75))
+							M.Weaken(20)
 						M.drowsyness  = max(M.drowsyness, 30)
 				data++
 				..()