Merge branch 'TauCetiStation:master' into master

code/_globalvars/lists/maintenance_loot.dm

@@ -183,6 +183,7 @@ var/global/list/uncommon_loot = list(
 		list(
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1,
 			/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 1,
+			/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 1,
 			) = 1,
 		list(
 			/obj/item/weapon/reagent_containers/spray/maintenance = 1,

code/controllers/subsystem/jobs.dm

@@ -546,6 +546,11 @@ SUBSYSTEM_DEF(job)
 
 	spawnId(H, rank, alt_title)
 
+	var/client/Cl = H.client
+	if(Cl && Cl.player_ingame_age && isnum(Cl.player_ingame_age) && Cl.player_ingame_age < 3000)
+		var/obj/item/clothing/accessory/newbiebadge/badge = new(H)
+		H.equip_or_collect(badge, SLOT_NECK)
+
 //		H.update_icons()
 
 	return TRUE

code/datums/spawners_menu/spawners_living.dm

@@ -186,6 +186,17 @@
 	to_chat(mob, "<B>Эта посудина теперь ваш новый дом, похозяйничайте в нём.</B>")
 	to_chat(mob, "<B>(Вы можете грызть провода и лампочки).</B>")
 
+/datum/spawner/living/lizard
+	name = "Ящерица"
+	desc = "Вы появляетесь в своём новом доме"
+	time_for_registration = null
+	register_only = FALSE
+
+/datum/spawner/living/lizard/spawn_body(mob/dead/spectator)
+	. = ..()
+	to_chat(mob, "<B>Эта посудина теперь ваш новый дом, похозяйничайте в нём.</B>")
+	to_chat(mob, "<B>(Вы можете грызть провода и лампочки).</B>")
+
 /datum/spawner/living/sugar_larva
 	name = "Сладкая личинка"
 	desc = "Вы форма жизни используемая в качестве скота, ваша задача выжить на станции."

code/game/gamemodes/objectives/traders_objectives.dm

@@ -42,7 +42,7 @@
 		"факс" = /obj/machinery/faxmachine,
 		"ядерную боеголовку" = /obj/machinery/nuclearbomb,
 		"раздатчик атмосферных труб" = /obj/machinery/pipedispenser,
-		"кота главврача Дасти" = /mob/living/simple_animal/cat/dusty,
+		"питомца главврача Дасти" = /mob/living/simple_animal/cat/dusty,
 		"плазменный дробовик" = /obj/item/weapon/gun/plasma/p104sass,
 		"ручной телепортер" = /obj/item/weapon/hand_tele,
 		"тыквяк" = /obj/item/weapon/reagent_containers/food/snacks/grown/gourd,

code/game/jobs/job/captain.dm

@@ -49,7 +49,7 @@
 		access_security, access_sec_doors, access_brig, access_forensics_lockers,
 		access_medical, access_change_ids, access_ai_upload, access_eva, access_heads,
 		access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
-		access_crematorium, access_kitchen, access_cargo, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
+		access_crematorium, access_kitchen, access_cargo, access_cargoshop, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 		access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
 		access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_recycler, access_detective, access_barber
 	)

code/game/machinery/vending/eat.dm

@@ -22,6 +22,7 @@
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 8,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
 		/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2,
 		/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
@@ -177,6 +178,7 @@
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
 	products = list(
 		/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 10,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10,
@@ -190,6 +192,7 @@
 	)
 	prices = list(
 		/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 3,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 3,
@@ -275,6 +278,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/fries/cardboard = 6,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/cardboard = 4,
 		/obj/item/weapon/reagent_containers/food/snacks/hotdog = 5,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 5,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 5,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 5,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 5,
@@ -285,6 +289,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/fries/cardboard = 6,
 		/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/cardboard = 9,
 		/obj/item/weapon/reagent_containers/food/snacks/hotdog = 9,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 3,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 3,

code/game/objects/items/weapons/storage/boxes.dm

@@ -199,6 +199,17 @@
 	for(var/i in 1 to 7)
 		new /obj/item/ammo_casing/r4046/chem/EMP(src)
 
+//Explosion 40x46mm
+/obj/item/weapon/storage/box/r4046/explosion
+	name = "box of 40x46mm explosive grenades (WARNING)"
+	desc = "<span class='bold'>WARNING: These devices are extremely dangerous and can cause injury.</span>"
+	icon_state = "4046_box(exp)"
+
+/obj/item/weapon/storage/box/r4046/explosion/atom_init()
+	. = ..()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/r4046/explosive(src)
+
 //EMPs
 /obj/item/weapon/storage/box/emps
 	name = "box of emp grenades"

code/modules/cargo/packs.dm

@@ -410,6 +410,16 @@ var/global/list/all_supply_groups = list("Operations","Security","Hospitality","
 	access = access_armory
 	group = "Security"
 
+/datum/supply_pack/ballistic/exp4046
+	name = "40x46mm explosive grenades"
+	contains = list(/obj/item/weapon/storage/box/r4046/explosion,
+					/obj/item/weapon/storage/box/r4046/explosion)
+	additional_costs = 520
+	crate_type = /obj/structure/closet/crate/secure
+	crate_name = "40x46mm explosive grenades"
+	access = access_armory
+	group = "Security"
+
 /datum/supply_pack/ballistic/m79
 	name = "m79 grenade launcher"
 	contains = list(/obj/item/weapon/gun/projectile/grenade_launcher/m79,

code/modules/clothing/under/accessories/accessory.dm

@@ -419,3 +419,33 @@
 /obj/item/clothing/accessory/holobadge/emp_act(severity)
 	if(camera)
 		camera.emp_act(1)
+
+
+/obj/item/clothing/accessory/newbiebadge
+	name = "newbie badge"
+	desc = "Бейджик с надписью: \"Я здесь новенький!\"."
+	icon_state = "newbieBadge"
+	item_state_world = "newbieBadge_world"
+	slot_flags = SLOT_FLAGS_NECK | SLOT_FLAGS_TIE
+
+	item_action_types = list(/datum/action/item_action/hands_free/showBadge)
+
+/obj/item/clothing/accessory/newbiebadge/attack(mob/living/carbon/human/M, mob/living/user)
+	if(isliving(user))
+		user.visible_message(
+			"<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>",
+			"<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
+
+/obj/item/clothing/accessory/newbiebadge/attack_self(mob/user)
+	if(isliving(user))
+		user.visible_message(
+			"<span class='warning'>[user] показывает свой бейдж NanoTrasen Employee Adaptation Program.\nС надписью: \"Я здесь новенький!\".</span>",
+			"<span class='warning'>Вы показываете свой бейдж NanoTrasen Employee Adaptation Program.\nС надписью: \"Я здесь новенький!\".</span>")
+
+/datum/action/item_action/hands_free/showBadge
+	name = "Show Badge"
+
+/datum/action/item_action/hands_free/showBadge/Activate()
+	usr.visible_message(
+		"<span class='warning'>[usr] показывает свой бейдж NanoTrasen Employee Adaptation Program.\nС надписью: \"Я здесь новенький!\".</span>",
+		"<span class='warning'>Вы показываете свой бейдж NanoTrasen Employee Adaptation Program.\nС надписью: \"Я здесь новенький!\".</span>")

code/modules/events/infestation.dm

@@ -76,7 +76,8 @@
 				var/mob/living/simple_animal/SA = new spawn_type(T)
 				if(istype(SA, /mob/living/simple_animal/mouse/rat))
 					create_spawner(/datum/spawner/living/rat, SA)
-
+				if(istype(SA, /mob/living/simple_animal/lizard))
+					create_spawner(/datum/spawner/living/lizard, SA)
 #undef INFESTATION_LOCATIONS
 
 #undef VERM_MICE

code/modules/library/lib_machines.dm

@@ -540,6 +540,7 @@
 	if(istype(O, /obj/item/weapon/paper))
 		user.drop_from_inventory(O, src)
 		user.SetNextMove(CLICK_CD_MELEE)
+		flick("binder1", src)
 		user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].")
 		visible_message("[src] begins to hum as it warms up its printing drums.")
 		sleep(rand(200,400))

code/modules/mob/living/carbon/human/human.dm

@@ -1922,7 +1922,9 @@
 	var/obj/item/organ/internal/heart/Heart = organs_by_name[O_HEART]
 	var/obj/item/organ/internal/heart/Lungs = organs_by_name[O_LUNGS]
 
+	var/fail_damage = apply_skill_bonus(user, 20, list(/datum/skill/medical = SKILL_LEVEL_NONE),  multiplier = -0.20)
 	var/needed_massages = 12
+	var/obj/item/organ/external/BP = get_bodypart(Heart.parent_bodypart)
 	if(HAS_TRAIT(src, TRAIT_FAT))
 		needed_massages = 20
 	if(Lungs && !Lungs.is_bruised())
@@ -1972,17 +1974,14 @@
 		else
 			massages_done_right--
 			to_chat(user, "<span class='warning'>You've skipped a beat.</span>")
+			if ((BP.body_zone == BP_CHEST && op_stage.ribcage != 2) || BP.open < 2)
+				apply_damage(fail_damage, BRUTE, BP.body_zone)
 
 	else
 		to_chat(user, "<span class='warning'>It seems [src]'s [Heart] is too squishy... It doesn't beat at all!</span>")
 
 	last_massage = world.time
 
-	var/obj/item/organ/external/BP = get_bodypart(Heart.parent_bodypart)
-	if (((BP.body_zone == BP_CHEST && op_stage.ribcage != 2) || BP.open < 2) && prob(5))
-		BP.fracture()
-		to_chat(user, "<span class='warning'>You hear cracking in [src]'s [BP]!.</span>")
-
 /mob/living/carbon/human/proc/return_to_body_dialog()
 	// just give a sound notification if already in the body
 	if (client)

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -140,7 +140,7 @@
 ADD_TO_GLOBAL_LIST(/mob/living/simple_animal/cat/dusty, chief_animal_list)
 /mob/living/simple_animal/cat/dusty
 	name = "Dusty"
-	desc = "Его шерсть на вид и ощупь напоминает бархат."
+	desc = "Шерсть этого зверька на вид и ощупь напоминает бархат."
 
 /mob/living/simple_animal/cat/Syndi
 	name = "SyndiCat"

code/modules/reagents/grenade_launcher.dm

@@ -8,11 +8,34 @@
 	throw_range = 10
 	force = 5.0
 	var/list/grenades = list()
-	var/max_grenades = 3
+	var/max_grenades = 5
 	m_amt = 2000
 	slot_flags = SLOT_FLAGS_BACK
 	can_be_holstered = FALSE
 
+/obj/item/weapon/gun/grenadelauncher/attack_hand(mob/user)
+	if(loc == user)
+		if(grenades.len > 0)
+			var/obj/item/weapon/grenade/G = grenades[grenades.len]
+			grenades -= G
+			user.put_in_hands(G)
+			to_chat(user, "<span class='notice'>You take \the [G] out of \the [src].</span>")
+			to_chat(user, "<span class='notice'>[grenades.len] / [max_grenades] Grenades.</span>")
+		else
+			to_chat(user, "<span class='warning'>The grenade launcher is empty.</span>")
+	else
+		return ..()
+
+/obj/item/weapon/gun/grenadelauncher/attack_self(mob/user)
+	if(grenades.len > 0)
+		var/obj/item/weapon/grenade/G = grenades[grenades.len]
+		grenades -= G
+		user.put_in_hands(G)
+		to_chat(user, "<span class='notice'>You take \the [G] out of \the [src].</span>")
+		to_chat(user, "<span class='notice'>[grenades.len] / [max_grenades] Grenades.</span>")
+	else
+		to_chat(user, "<span class='warning'>The grenade launcher is empty.</span>")
+
 /obj/item/weapon/gun/grenadelauncher/examine(mob/user)
 	..()
 	if(src in view(2, user))

code/modules/reagents/reagent_containers/food/cans.dm

@@ -127,6 +127,12 @@
 	icon_state = "cola"
 	list_reagents = list("cola" = 30)
 
+/obj/item/weapon/reagent_containers/food/drinks/cans/brepsi
+	name = "Brepsi"
+	desc = "Three or four sips of an absolutely refreshing drink."
+	icon_state = "brepsi"
+	list_reagents = list("cola" = 30)
+
 /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle
 	name = "Bottled Water"
 	desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."

code/modules/supermatter/supermatter.dm

@@ -34,11 +34,12 @@
 /obj/machinery/power/supermatter
 	name = "Supermatter"
 	desc = "A strangely translucent and iridescent crystal. <span class='warning'>You get headaches just from looking at it.</span>"
-	icon = 'icons/obj/engine.dmi'
+	icon = 'icons/obj/supermatter.dmi'
 	icon_state = "darkmatter"
 	density = TRUE
 	anchored = FALSE
 	light_range = 4
+	layer = 4
 
 	appearance_flags = PIXEL_SCALE // no tile bound to allow distortion to render outside of direct view
 	///Effect holder for the displacement filter to distort the SM based on its activity level

maps/boxstation/boxstation.dmm

@@ -57316,7 +57316,6 @@
 /area/station/civilian/garden)
 "ccP" = (
 /obj/machinery/door/firedoor,
-/obj/structure/window/fulltile,
 /obj/structure/window/fulltile{
 	grilled = 1;
 	icon_state = "gr_window"
@@ -85454,7 +85453,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/medbay)
 "ubH" = (
-/obj/structure/window/fulltile,
 /obj/structure/window/fulltile{
 	grilled = 1;
 	icon_state = "gr_window"

maps/centcom/centcom.dmm

@@ -16276,14 +16276,6 @@
 	icon_state = "dark"
 	},
 /area/centcom/control)
-"aLi" = (
-/obj/machinery/door/airlock/centcom{
-	dir = 4;
-	name = "General Access";
-	req_access = list(101)
-	},
-/turf/unsimulated/wall/like_a_normal/green,
-/area/centcom/control)
 "aLj" = (
 /obj/machinery/door/airlock/centcom{
 	name = "General Access";
@@ -19396,12 +19388,6 @@
 	icon_state = "wood"
 	},
 /area/centcom/living)
-"aTV" = (
-/obj/machinery/door/airlock/centcom{
-	name = "Courthouse"
-	},
-/turf/unsimulated/wall/like_a_normal/green,
-/area/centcom/living)
 "aTY" = (
 /turf/unsimulated/floor,
 /area/centcom/waitingroom)
@@ -19530,13 +19516,6 @@
 	icon_state = "wood"
 	},
 /area/centcom/living)
-"aUz" = (
-/obj/machinery/conveyor{
-	dir = 10;
-	id = "CentComConv01"
-	},
-/turf/unsimulated/floor,
-/area/centcom/holding)
 "aUE" = (
 /obj/structure/window/shuttle/reinforced/evac{
 	icon_state = "13,20"
@@ -57434,7 +57413,7 @@ aTF
 aTF
 aTF
 aTF
-aUz
+aTF
 aNs
 aaM
 aaM
@@ -67688,7 +67667,7 @@ aJu
 aJu
 aJu
 aJu
-aLi
+nkX
 aJu
 aJu
 aJu
@@ -76962,7 +76941,7 @@ aQS
 jcb
 iNb
 iNb
-aTV
+aLj
 aBK
 aAm
 aaM