Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11

2019-04-10 16:05:22 +02:00
parent ced2ee0ad0 13bb5802a3
commit f220f1cb12
263 changed files with 4007 additions and 1275 deletions
@@ -379,6 +379,26 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/proc/on_found(mob/finder)
 	return

+/obj/item/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params) //Copypaste of /atom/MouseDrop() since this requires code in a very specific spot
+	if(!usr || !over)
+		return
+	if(SEND_SIGNAL(src, COMSIG_MOUSEDROP_ONTO, over, usr) & COMPONENT_NO_MOUSEDROP)	//Whatever is receiving will verify themselves for adjacency.
+		return
+	if(over == src)
+		return usr.client.Click(src, src_location, src_control, params)
+	var/list/directaccess = usr.DirectAccess()
+	if((usr.CanReach(src) || (src in directaccess)) && (usr.CanReach(over) || (over in directaccess)))
+		if(!usr.get_active_held_item())
+			usr.UnarmedAttack(src, TRUE)
+			if(usr.get_active_held_item() == src)
+				melee_attack_chain(usr, over)
+			return
+	if(!Adjacent(usr) || !over.Adjacent(usr))
+		return // should stop you from dragging through windows
+
+	over.MouseDrop_T(src,usr)
+	return
+
 // called after an item is placed in an equipment slot
 // user is mob that equipped it
 // slot uses the slot_X defines found in setup.dm
@@ -23,6 +23,10 @@
 	var/obj/item/stock_parts/cell/high/cell
 	var/combat = FALSE //can we revive through space suits?
 	var/grab_ghost = FALSE // Do we pull the ghost back into their body?
+	var/healdisk = FALSE // Will we shock people dragging the body?
+	var/pullshocksafely = FALSE //Dose the unit have the healdisk upgrade?
+	var/primetime = 0 // is the defib faster
+	var/timedeath = 10

 /obj/item/defibrillator/get_cell()
 	return cell
@@ -441,7 +445,9 @@
 	return	(!H.suiciding && !(H.has_trait(TRAIT_NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)

 /obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
-	if(isliving(H.pulledby))		//CLEAR!
+	if(defib.pullshocksafely && isliving(H.pulledby))
+		H.visible_message("<span class='danger'>The defibrillator safely discharges the excessive charge into the floor!</span>")
+	else
 		var/mob/living/M = H.pulledby
 		if(M.electrocute_act(30, src))
 			M.visible_message("<span class='danger'>[M] is electrocuted by [M.p_their()] contact with [H]!</span>")
@@ -534,7 +540,7 @@
 	user.visible_message("<span class='warning'>[user] begins to place [src] on [H]'s chest.</span>", "<span class='warning'>You begin to place [src] on [H]'s chest...</span>")
 	busy = TRUE
 	update_icon()
-	if(do_after(user, 30, target = H)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
+	if(do_after(user, 30 - defib.primetime, target = H)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
 		user.visible_message("<span class='notice'>[user] places [src] on [H]'s chest.</span>", "<span class='warning'>You place [src] on [H]'s chest.</span>")
 		playsound(src, 'sound/machines/defib_charge.ogg', 75, 0)
 		var/tplus = world.time - H.timeofdeath
@@ -542,10 +548,10 @@
 		// (in deciseconds)
 		// brain damage starts setting in on the patient after
 		// some time left rotting
-		var/tloss = DEFIB_TIME_LOSS * 10
+		var/tloss = DEFIB_TIME_LOSS * defib.timedeath
 		var/total_burn	= 0
 		var/total_brute	= 0
-		if(do_after(user, 20, target = H)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
+		if(do_after(user, 20 - defib.primetime, target = H)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
 			for(var/obj/item/carried_item in H.contents)
 				if(istype(carried_item, /obj/item/clothing/suit/space))
 					if((!combat && !req_defib) || (req_defib && !defib.combat))
@@ -605,6 +611,8 @@
 					if(tplus > tloss)
 						H.adjustBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))), 150)
 					log_combat(user, H, "revived", defib)
+					if(defib.healdisk)
+						H.heal_overall_damage(25, 25)
 				if(req_defib)
 					defib.deductcharge(revivecost)
 					cooldown = 1
@@ -628,6 +636,37 @@
 	busy = FALSE
 	update_icon()

+/obj/item/defibrillator/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/disk/medical/defib_heal))
+		if(healdisk)
+			to_chat(user, "<span class='notice'>This unit is already upgraded with this disk!</span>")
+			return TRUE
+		to_chat(user, "<span class='notice'>You upgrade the unit with Heal upgrade disk!</span>")
+		healdisk = TRUE
+		return TRUE
+	if(istype(I, /obj/item/disk/medical/defib_shock))
+		if(pullshocksafely)
+			to_chat(user, "<span class='notice'>This unit is already upgraded with this disk!</span>")
+			return TRUE
+		to_chat(user, "<span class='notice'>You upgrade the unit with Shock Safety upgrade disk!</span>")
+		pullshocksafely = TRUE
+		return TRUE
+	if(istype(I, /obj/item/disk/medical/defib_speed))
+		if(!primetime == initial(primetime))
+			to_chat(user, "<span class='notice'>This unit is already upgraded with this disk!</span>")
+			return TRUE
+		to_chat(user, "<span class='notice'>You upgrade the unit with Speed upgrade disk!</span>")
+		primetime = 10
+		return TRUE
+	if(istype(I, /obj/item/disk/medical/defib_decay))
+		if(!timedeath == initial(timedeath))
+			to_chat(user, "<span class='notice'>This unit is already upgraded with this disk!</span>")
+			return TRUE
+		to_chat(user, "<span class='notice'>You upgrade the unit with Longer Decay upgrade disk!</span>")
+		timedeath = 20
+		return TRUE
+	return ..()
+
 /obj/item/twohanded/shockpaddles/cyborg
 	name = "cyborg defibrillator paddles"
 	icon = 'icons/obj/items_and_weapons.dmi'
@@ -656,4 +695,40 @@
 	item_state = "defibpaddles0"
 	req_defib = FALSE

+///////////////////////////////////////////
+/////////Dedibrillators Disks//////////////
+///////////////////////////////////////////
+
+/obj/item/disk/medical
+	name = "Defibrillator Upgrade Disk"
+	desc = "A blank defibrillator disk..."
+	icon = 'modular_citadel/icons/obj/defib_disks.dmi'
+	icon_state = "upgrade_disk"
+	item_state = "heal_disk"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/disk/medical/defib_heal
+	name = "Defibrillator Healing Disk"
+	desc = "A disk alowing for grater amounts of healing"
+	icon_state = "heal_disk"
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 6000, MAT_SILVER = 6000)
+
+/obj/item/disk/medical/defib_shock
+	name = "Defibrillator Anti-Shock Disk"
+	desc = "A disk that helps agains shocking anyone, other then the intented target"
+	icon_state = "zap_disk"
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 6000, MAT_SILVER = 6000)
+
+/obj/item/disk/medical/defib_decay
+	name = "Defibrillator Body-Decay Extender Disk"
+	desc = "A disk that helps defibrillators revive the longer decayed"
+	icon_state = "body_disk"
+	materials = list(MAT_METAL=16000, MAT_GLASS = 18000, MAT_GOLD = 16000, MAT_SILVER = 6000, MAT_TITANIUM = 2000)
+
+/obj/item/disk/medical/defib_speed
+	name = "Defibrllator Pre-Primer Disk"
+	desc = "A disk that cuts the time charg time in half for defibrillator use"
+	icon_state = "fast_disk"
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_GOLD = 26000, MAT_SILVER = 26000)
+
 #undef HALFWAYCRITDEATH
@@ -220,7 +220,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 				dat += text("ID: <a href='?src=[REF(src)];choice=Authenticate'>[id ? "[id.registered_name], [id.assignment]" : "----------"]")
 				dat += text("<br><a href='?src=[REF(src)];choice=UpdateInfo'>[id ? "Update PDA Info" : ""]</A><br><br>")

-				dat += "[station_time_timestamp()]<br>" //:[world.time / 100 % 6][world.time / 100 % 10]"
+				dat += "[STATION_TIME_TIMESTAMP("hh:mm:ss")]<br>" //:[world.time / 100 % 6][world.time / 100 % 10]"
 				dat += "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer+540]"

 				dat += "<br><br>"
@@ -391,6 +391,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 //BASIC FUNCTIONS===================================

 			if("Refresh")//Refresh, goes to the end of the proc.
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 			if ("Toggle_Font")
 				//CODE REVISION 2
@@ -405,12 +406,16 @@ GLOBAL_LIST_EMPTY(PDAs)
 						font_mode = FONT_ORBITRON
 					if (MODE_VT)
 						font_mode = FONT_VT
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if ("Change_Color")
 				var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').",background_color)as color
 				background_color = new_color
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 			if ("Toggle_Underline")
 				underline_flag = !underline_flag
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 			if("Return")//Return
 				if(mode<=9)
@@ -419,13 +424,19 @@ GLOBAL_LIST_EMPTY(PDAs)
 					mode = round(mode/10)
 					if(mode==4 || mode == 5)//Fix for cartridges. Redirects to hub.
 						mode = 0
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if ("Authenticate")//Checks for ID
 				id_check(U)
+
 			if("UpdateInfo")
 				ownjob = id.assignment
 				if(istype(id, /obj/item/card/id/syndicate))
 					owner = id.registered_name
 				update_label()
+				playsound(src, 'sound/machines/terminal_processing.ogg', 50, 1)
+				addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/machines/terminal_success.ogg', 50, 1), 13)
+
 			if("Eject")//Ejects the cart, only done from hub.
 				if (!isnull(cartridge))
 					U.put_in_hands(cartridge)
@@ -434,55 +445,74 @@ GLOBAL_LIST_EMPTY(PDAs)
 					cartridge.host_pda = null
 					cartridge = null
 					update_icon()
+				playsound(src, 'sound/machines/terminal_eject_disc.ogg', 50, 1)

 //MENU FUNCTIONS===================================

 			if("0")//Hub
 				mode = 0
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
 			if("1")//Notes
 				mode = 1
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
 			if("2")//Messenger
 				mode = 2
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
 			if("21")//Read messeges
 				mode = 21
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
 			if("3")//Atmos scan
 				mode = 3
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
 			if("4")//Redirects to hub
 				mode = 0
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)


 //MAIN FUNCTIONS===================================

 			if("Light")
 				toggle_light()
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if("Medical Scan")
 				if(scanmode == PDA_SCANNER_MEDICAL)
 					scanmode = PDA_SCANNER_NONE
 				else if((!isnull(cartridge)) && (cartridge.access & CART_MEDICAL))
 					scanmode = PDA_SCANNER_MEDICAL
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if("Reagent Scan")
 				if(scanmode == PDA_SCANNER_REAGENT)
 					scanmode = PDA_SCANNER_NONE
 				else if((!isnull(cartridge)) && (cartridge.access & CART_REAGENT_SCANNER))
 					scanmode = PDA_SCANNER_REAGENT
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if("Halogen Counter")
 				if(scanmode == PDA_SCANNER_HALOGEN)
 					scanmode = PDA_SCANNER_NONE
 				else if((!isnull(cartridge)) && (cartridge.access & CART_ENGINE))
 					scanmode = PDA_SCANNER_HALOGEN
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if("Honk")
 				if ( !(last_noise && world.time < last_noise + 20) )
 					playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
 					last_noise = world.time
+
 			if("Trombone")
 				if ( !(last_noise && world.time < last_noise + 20) )
 					playsound(src, 'sound/misc/sadtrombone.ogg', 50, 1)
 					last_noise = world.time
+
 			if("Gas Scan")
 				if(scanmode == PDA_SCANNER_GAS)
 					scanmode = PDA_SCANNER_NONE
 				else if((!isnull(cartridge)) && (cartridge.access & CART_ATMOS))
 					scanmode = PDA_SCANNER_GAS
+				playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 			if("Drone Phone")
 				var/alert_s = input(U,"Alert severity level","Ping Drones",null) as null|anything in list("Low","Medium","High","Critical")
 				var/area/A = get_area(U)
@@ -490,6 +520,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 					var/msg = "<span class='boldnotice'>NON-DRONE PING: [U.name]: [alert_s] priority alert in [A.name]!</span>"
 					_alert_drones(msg, TRUE, U)
 					to_chat(U, msg)
+					playsound(src, 'sound/machines/terminal_success.ogg', 50, 1)


 //NOTEKEEPER FUNCTIONS===================================
@@ -641,6 +672,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	if (!signal.data["done"])
 		to_chat(user, "<span class='notice'>ERROR: Server isn't responding.</span>")
 		return
+		playsound(src, 'sound/machines/terminal_error.ogg', 50, 1)

 	var/target_text = signal.format_target()
 	// Log it in our logs
@@ -653,6 +685,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	// Log in the talk log
 	user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text]")
 	to_chat(user, "<span class='info'>Message sent to [target_text]: \"[message]\"</span>")
+	playsound(src, 'sound/machines/terminal_success.ogg', 50, 1)
 	// Reset the photo
 	picture = null
 	last_text = world.time
@@ -699,8 +732,10 @@ GLOBAL_LIST_EMPTY(PDAs)

 	if(id)
 		remove_id()
+		playsound(src, 'sound/machines/terminal_eject_disc.ogg', 50, 1)
 	else
 		remove_pen()
+		playsound(src, 'sound/machines/button4.ogg', 50, 1)

 /obj/item/pda/CtrlClick()
 	..()
@@ -776,6 +811,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 		if(old_id)
 			user.put_in_hands(old_id)
 		update_icon()
+		playsound(src, 'sound/machines/button.ogg', 50, 1)
 	return TRUE

 // access to status display signals
@@ -787,17 +823,21 @@ GLOBAL_LIST_EMPTY(PDAs)
 		cartridge.host_pda = src
 		to_chat(user, "<span class='notice'>You insert [cartridge] into [src].</span>")
 		update_icon()
+		playsound(src, 'sound/machines/button.ogg', 50, 1)

 	else if(istype(C, /obj/item/card/id))
 		var/obj/item/card/id/idcard = C
 		if(!idcard.registered_name)
 			to_chat(user, "<span class='warning'>\The [src] rejects the ID!</span>")
 			return
+			playsound(src, 'sound/machines/terminal_error.ogg', 50, 1)
+
 		if(!owner)
 			owner = idcard.registered_name
 			ownjob = idcard.assignment
 			update_label()
 			to_chat(user, "<span class='notice'>Card scanned.</span>")
+			playsound(src, 'sound/machines/terminal_success.ogg', 50, 1)
 		else
 			//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
 			if(((src in user.contents) || (isturf(loc) && in_range(src, user))) && (C in user.contents))
@@ -823,6 +863,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 			to_chat(user, "<span class='notice'>You slide \the [C] into \the [src].</span>")
 			inserted_item = C
 			update_icon()
+			playsound(src, 'sound/machines/button.ogg', 50, 1)
+
 	else if(istype(C, /obj/item/photo))
 		var/obj/item/photo/P = C
 		picture = P.picture
@@ -114,7 +114,7 @@
 /obj/item/pda/heads/rd
 	name = "research director PDA"
 	default_cartridge = /obj/item/cartridge/rd
-	inserted_item = /obj/item/pen/fountain
+	inserted_item = /obj/item/pen/fourcolor
 	icon_state = "pda-rd"

 /obj/item/pda/captain
@@ -185,6 +185,12 @@
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
 	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"

+/obj/item/pda/neko
+	name = "neko PDA"
+	icon_state = "pda-neko"
+	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition a feline fine case."
+	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Mew Turbo Limited Edition NYA~!"
+
 /obj/item/pda/cook
 	name = "cook PDA"
 	icon_state = "pda-cook"
@@ -580,6 +580,7 @@ Code:
 			host_pda.mode = 441
 			if(!active2)
 				active1 = null
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Security Records")
 			active1 = find_record("id", href_list["target"], GLOB.data_core.general)
@@ -588,19 +589,23 @@ Code:
 			host_pda.mode = 451
 			if(!active3)
 				active1 = null
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Send Signal")
 			INVOKE_ASYNC(radio, /obj/item/integrated_signaler.proc/send_activation)
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Signal Frequency")
 			var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"]))
 			radio.set_frequency(new_frequency)
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Signal Code")
 			radio.code += text2num(href_list["scode"])
 			radio.code = round(radio.code)
 			radio.code = min(100, radio.code)
 			radio.code = max(1, radio.code)
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Status")
 			switch(href_list["statdisp"])
@@ -616,16 +621,21 @@ Code:
 					updateSelfDialog()
 				else
 					post_status(href_list["statdisp"])
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
+
 		if("Power Select")
 			var/pnum = text2num(href_list["target"])
 			powmonitor = powermonitors[pnum]
 			host_pda.mode = 433
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Supply Orders")
 			host_pda.mode =47
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Newscaster Access")
 			host_pda.mode = 53
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Newscaster Message")
 			var/host_pda_owner_name = host_pda.id ? "[host_pda.id.registered_name] ([host_pda.id.assignment])" : "Unknown"
@@ -641,11 +651,13 @@ Code:
 			GLOB.news_network.SubmitArticle(message,host_pda.owner,current_channel)
 			host_pda.Topic(null,list("choice"=num2text(host_pda.mode)))
 			return
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 		if("Newscaster Switch Channel")
 			current_channel = host_pda.msg_input()
 			host_pda.Topic(null,list("choice"=num2text(host_pda.mode)))
 			return
+			playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 	//Bot control section! Viciously ripped from radios for being laggy and terrible.
 	if(href_list["op"])
@@ -656,10 +668,13 @@ Code:

 			if("botlist")
 				active_bot = null
+
 			if("summon") //Args are in the correct order, they are stated here just as an easy reminder.
 				active_bot.bot_control(command= "summon", user_turf= get_turf(usr), user_access= host_pda.GetAccess())
+
 			else //Forward all other bot commands to the bot itself!
 				active_bot.bot_control(command= href_list["op"], user= usr)
+		playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 	if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work.

@@ -34,6 +34,10 @@
 	if(LAZYLEN(current_fields) >= max_fields)
 		to_chat(user, "<span class='notice'>[src] cannot sustain any more forcefields!</span>")
 		return
+	var/obj/structure/projected_forcefield/same = locate() in T
+	if(same)
+		to_chat(user, "<span class='notice'>There is already a forcefield on [T]!</span>")
+		return

 	playsound(src,'sound/weapons/resonator_fire.ogg',50,1)
 	user.visible_message("<span class='warning'>[user] projects a forcefield!</span>","<span class='notice'>You project a forcefield.</span>")
@@ -59,6 +63,8 @@

 /obj/item/forcefield_projector/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	for(var/i in current_fields)
+		qdel(i)
 	return ..()

 /obj/item/forcefield_projector/process()
@@ -504,6 +504,31 @@
 		var/obj/item/surgical_processor/SP = locate() in R.module
 		R.module.remove_module(SP, TRUE)

+/obj/item/borg/upgrade/advhealth
+	name = "advanced cyborg health scanner"
+	desc = "An upgrade to the Medical modules, installing a built-in \
+		advanced health scanner, for better readings on patients."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = list(
+		/obj/item/robot_module/medical,
+		/obj/item/robot_module/syndicate_medical,
+		/obj/item/robot_module/medihound,
+		/obj/item/robot_module/borgi) 
+
+/obj/item/borg/upgrade/advhealth/action(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if(.)
+		var/obj/item/healthanalyzer/advanced/AH = new(R.module)
+		R.module.basic_modules += AH
+		R.module.add_module(AH, FALSE, TRUE)
+
+/obj/item/borg/upgrade/processor/deactivate(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if (.)
+		var/obj/item/healthanalyzer/advanced/AH = locate() in R.module
+		R.module.remove_module(AH, TRUE)
+
 /obj/item/borg/upgrade/ai
 	name = "B.O.R.I.S. module"
 	desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI."
@@ -638,4 +663,4 @@
 	name = "borg module picker (Clown)"
 	desc = "Allows you to to turn a cyborg into a clown, honk."
 	icon_state = "cyborg_upgrade3"
-	new_module = /obj/item/robot_module/clown
+	new_module = /obj/item/robot_module/clown
@@ -170,4 +170,7 @@

 /obj/item/stack/medical/ointment/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?</span>")
-	return TOXLOSS
+	return TOXLOSS
+
+/obj/item/stack/medical/get_belt_overlay()
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch")
@@ -1,5 +1,5 @@
 /*
- *	These absorb the functionality of the plant bag, ore satchel, etc.
+ *	These absorb the functionality of the plant bag, ore satchel, etc
 *	They use the use_to_pickup, quick_gather, and quick_empty functions
 *	that were already defined in weapon/storage, but which had been
 *	re-implemented in other classes.
@@ -162,6 +162,26 @@
 /obj/item/storage/bag/ore/cyborg
 	name = "cyborg mining satchel"

+/obj/item/storage/bag/ore/cyborg/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage/concrete/stack)
+	STR.allow_quick_empty = TRUE
+	STR.can_hold = typecacheof(list(/obj/item/stack/ore))
+	STR.max_w_class = WEIGHT_CLASS_HUGE
+	STR.max_combined_stack_amount = 150
+
+/obj/item/storage/bag/ore/large
+	name = "large mining satchel"
+	desc = "This bag can hold three times the ore in many small pockets. Shockingly foldable and compact for its volume."
+
+/obj/item/storage/bag/ore/large/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage/concrete/stack)
+	STR.allow_quick_empty = TRUE
+	STR.can_hold = typecacheof(list(/obj/item/stack/ore))
+	STR.max_w_class = WEIGHT_CLASS_HUGE
+	STR.max_combined_stack_amount = 150
+
 /obj/item/storage/bag/ore/holding //miners, your messiah has arrived
 	name = "mining satchel of holding"
 	desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures."
@@ -365,3 +385,15 @@
 	STR.max_items = 25
 	STR.insert_preposition = "in"
 	STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube))
+
+/obj/item/storage/bag/bio/holding
+	name = "bio bag of holding"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bspace_biobag"
+	desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
+
+/obj/item/storage/bag/bio/holding/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_combined_w_class = INFINITY
+	STR.max_items = 100
@@ -115,6 +115,7 @@
 	desc = "Can hold various medical equipment."
 	icon_state = "medicalbelt"
 	item_state = "medical"
+	content_overlays = TRUE

 /obj/item/storage/belt/medical/ComponentInitialize()
 	. = ..()
@@ -136,6 +137,7 @@
 		/obj/item/flashlight/pen,
 		/obj/item/extinguisher/mini,
 		/obj/item/reagent_containers/hypospray,
+		/obj/item/hypospray/mkii,
 		/obj/item/sensor_device,
 		/obj/item/radio,
 		/obj/item/clothing/gloves/,
@@ -172,6 +174,7 @@
 /obj/item/storage/belt/medical/surgery_belt_adv
 	name = "surgical supply belt"
 	desc = "A specialized belt designed for holding surgical equipment. It seems to have specific pockets for each and every surgical tool you can think of."
+	content_overlays = FALSE

 /obj/item/storage/belt/medical/surgery_belt_adv/PopulateContents()
 	new /obj/item/hemostat/adv(src)
@@ -357,7 +360,7 @@
 		/obj/item/reagent_containers/food/snacks,
 		/obj/item/reagent_containers/food/drinks
 		))
-	
+
 	var/amount = 5
 	var/rig_snacks
 	while(contents.len <= amount)
@@ -112,12 +112,17 @@
 /obj/item/storage/firstaid/radbgone/PopulateContents()
 	if(empty)
 		return
+	if(prob(50))
+		new /obj/item/reagent_containers/pill/mutarad(src)
+	if(prob(80))
+		new /obj/item/reagent_containers/pill/antirad_plus(src)
 	new /obj/item/reagent_containers/syringe/charcoal(src)
 	new /obj/item/storage/pill_bottle/charcoal(src)
 	new /obj/item/reagent_containers/pill/mutadone(src)
 	new /obj/item/reagent_containers/pill/antirad(src)
 	new /obj/item/reagent_containers/food/drinks/bottle/vodka(src)
 	new /obj/item/healthanalyzer(src)
+	

 /obj/item/storage/firstaid/o2
 	name = "oxygen deprivation treatment kit"
@@ -291,3 +296,19 @@
 /obj/item/storage/pill_bottle/aranesp/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/pill/aranesp(src)
+
+/obj/item/storage/pill_bottle/antirad_plus
+	name = "anti radiation deluxe pill bottle"
+	desc = "The label says 'Med-Co branded pills'."
+
+/obj/item/storage/pill_bottle/antirad_plus/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/pill/antirad_plus(src)
+
+/obj/item/storage/pill_bottle/mutarad
+	name = "radiation treatment deluxe pill bottle"
+	desc = "The label says 'Med-Co branded pills' and below that 'Contains Mutadone in each pill!`."
+
+/obj/item/storage/pill_bottle/mutarad/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/pill/mutarad(src)
@@ -1089,7 +1089,7 @@

 /obj/item/toy/clockwork_watch/examine(mob/user)
 	..()
-	to_chat(user, "<span class='info'>Station Time: [station_time_timestamp()]")
+	to_chat(user, "<span class='info'>Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]")

 /*
 * Toy Dagger
@@ -6,6 +6,7 @@
 /obj/structure/closet/secure_closet/quartermaster/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/qm(src)
+	new /obj/item/clothing/head/beret/qm(src)
 	new /obj/item/storage/lockbox/medal/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -6,6 +6,7 @@
 /obj/structure/closet/secure_closet/engineering_chief/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/ce(src)
+	new /obj/item/clothing/head/beret/ce(src)
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/welding(src)
@@ -55,6 +55,7 @@
 /obj/structure/closet/secure_closet/CMO/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/cmo(src)
+	new /obj/item/clothing/head/beret/cmo(src)
 	new /obj/item/storage/backpack/duffelbag/med(src)
 	new /obj/item/clothing/suit/bio_suit/cmo(src)
 	new /obj/item/clothing/head/bio_hood/cmo(src)
@@ -6,6 +6,7 @@
 /obj/structure/closet/secure_closet/RD/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/rd(src)
+	new /obj/item/clothing/head/beret/rd(src)
 	new /obj/item/clothing/suit/bio_suit/scientist(src)
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 	new /obj/item/clothing/suit/toggle/labcoat(src)
@@ -19,6 +19,7 @@
 	new /obj/item/clothing/under/captainparade(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
 	new /obj/item/clothing/head/caphat/parade(src)
+	new /obj/item/clothing/head/caphat/beret(src)
 	new /obj/item/clothing/suit/captunic(src)
 	new /obj/item/clothing/under/rank/captain/femformal(src)  //citadel edit
 	new /obj/item/clothing/head/crown/fancy(src)
@@ -44,6 +45,7 @@
 	new /obj/item/clothing/neck/cloak/hop(src)
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
 	new /obj/item/clothing/head/hopcap(src)
+	new /obj/item/clothing/head/hopcap/beret(src)
 	new /obj/item/cartridge/hop(src)
 	new /obj/item/radio/headset/heads/hop(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)