Фиксы всего

Добавить в товары регенератор теслы и синги, пакман --- ОК Правила воксов: не убей, не расходуй, и прочую хуйню --- Добавил 1 памятку. ОК Доделать карты - ОК Добавить вокс флаг Элла, также в продажу --- ОК Заменить двери в шаттле на разбиваемые --- ОК Хайриски слишком дешевые. 750 - мало. Повысить до 2500 --- ОК Добавить проверку чтобы при 30 человек сценарий дополнительно не закидывался. --- ОК Вроде накинул, проверить на тестмердже хайпопе не выкинет ли рантайм Добавить кнопку "Телепортировать на станцию воксов" при одевании и оффере --- ОК Убрать продажу органов с человека. Если продаешь человека в расчичетчике, то его возвращает на станцию в прибытие. --- ОК ВОКС-Майндслейв? - Аля ставишь вокса-рекрута в Расчичетчик, после чего он получает антажку воксо-рейдера. Если нет майндшилда --- ОК Запретить не ВОКСам пользоваться пушками или сделать на это ограничение, что если пушку взял "Вокс", то больше его никто трогать не может. --- ОК Доделать фонарики и счетчик гейгера в ригах --- Ок
ss220club · Mar 28, 2024 · 9b8cc83 · 9b8cc83
1 parent 8608711
commit 9b8cc83
Show file tree

Hide file tree

Showing 11 changed files with 151 additions and 33 deletions.
diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
@@ -3197,13 +3197,16 @@
 	},
 /area/syndicate_mothership/cargo)
 "bXl" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "152";
-	name = "vox hatch";
-	aiControlDisabled = 1;
-	hackProof = 1
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/survival_pod/glass,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium{
 	color = "#ff78f4";
 	nitrogen = 103.984;
@@ -3722,6 +3725,18 @@
 /obj/item/radio/intercom/directional/south,
 /turf/simulated/floor/plasteel/dark,
 /area/shuttle/escape)
+"coz" = (
+/obj/effect/spawner/window/shuttle/survival_pod,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/floor/plating/nitrogen,
+/area/shuttle/vox)
 "coD" = (
 /obj/structure/table/wood{
 	color = "#996633"
@@ -5488,6 +5503,14 @@
 	hackProof = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium/red/nitrogen,
 /area/shuttle/vox)
 "drF" = (
@@ -6384,6 +6407,14 @@
 	hackProof = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium{
 	color = "#fff894";
 	nitrogen = 103.984;
@@ -7320,6 +7351,14 @@
 	hackProof = 1
 	},
 /obj/structure/fans/tiny,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium{
 	color = "#fff894";
 	nitrogen = 103.984;
@@ -12661,6 +12700,12 @@
 	},
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/syndicate_mothership/jail)
+"hEK" = (
+/turf/simulated/wall/mineral/plastitanium/nosmooth{
+	icon_state = "plastitanium_wall-0";
+	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	},
+/area/vox_base)
 "hER" = (
 /obj/machinery/conveyor/south{
 	id = "SFBQMLoad"
@@ -20614,7 +20659,7 @@
 "mLW" = (
 /obj/machinery/door_control{
 	id = "voxshutters";
-	name = "remote shutter control";
+	name = "vox remote shutter control";
 	req_access = list(152);
 	wires = 1;
 	pixel_x = 28;
@@ -21646,6 +21691,14 @@
 	hackProof = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium{
 	color = "#fff894";
 	nitrogen = 103.984;
@@ -25435,6 +25488,9 @@
 /obj/effect/turf_decal/delivery/white,
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/supply)
+"pXq" = (
+/turf/simulated/wall/indestructible/opsglass/limited_smooth,
+/area/vox_base)
 "pXu" = (
 /obj/structure/platform{
 	dir = 8;
@@ -28428,6 +28484,13 @@
 	hackProof = 1
 	},
 /obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium/red/nitrogen,
 /area/shuttle/vox)
 "rMS" = (
@@ -31257,6 +31320,14 @@
 	aiControlDisabled = 1;
 	hackProof = 1
 	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium{
 	color = "#ff78f4";
 	nitrogen = 103.984;
@@ -32804,6 +32875,29 @@
 	icon_state = "rampbottom"
 	},
 /area/syndicate_mothership/cargo)
+"uDL" = (
+/obj/machinery/door/airlock/hatch{
+	req_access_txt = "152";
+	name = "vox hatch";
+	aiControlDisabled = 1;
+	hackProof = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
+/turf/simulated/floor/mineral/plastitanium{
+	color = "#ff78f4";
+	nitrogen = 103.984;
+	oxygen = 0;
+	name = "vox floor"
+	},
+/area/shuttle/vox)
 "uEs" = (
 /obj/machinery/porta_turret/syndicate/interior,
 /obj/structure/window/plasmareinforced{
@@ -36352,6 +36446,14 @@
 	hackProof = 1
 	},
 /obj/structure/fans/tiny,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 1;
+	icon_state = "open";
+	id_tag = "voxshutters";
+	name = "Blast Shutters";
+	opacity = 0
+	},
 /turf/simulated/floor/mineral/plastitanium/red/nitrogen,
 /area/shuttle/vox)
 "wQK" = (
@@ -80313,7 +80415,7 @@ ijC
 gXG
 ryz
 jgL
-gXG
+hEK
 qGp
 qGp
 qGp
@@ -80570,7 +80672,7 @@ iBC
 hAK
 fkL
 fkL
-ryz
+pXq
 eBl
 ayB
 oXe
@@ -81084,7 +81186,7 @@ fJi
 gXG
 fkL
 vUt
-gXG
+hEK
 qGp
 qGp
 qGp
@@ -81341,7 +81443,7 @@ fJi
 gXG
 hAK
 gXG
-gXG
+hEK
 qGp
 vVW
 qgx
@@ -81351,7 +81453,7 @@ qGp
 hCs
 plY
 nsh
-qGp
+coz
 eMD
 lsW
 qPS
@@ -81604,7 +81706,7 @@ lfu
 bGr
 bGr
 bGr
-bXl
+uDL
 bGr
 bGr
 bGr
@@ -82122,7 +82224,7 @@ qGp
 hCs
 plY
 gxA
-qGp
+coz
 vWb
 chV
 chV

diff --git a/modular_ss220/antagonists/code/antag_datum.dm b/modular_ss220/antagonists/code/antag_datum.dm
@@ -1,6 +1,6 @@
-/datum/antagonist/proc/make_body(loc_spawn, try_use_preference = FALSE, species_name = null, list/possible_species)
+/datum/antagonist/proc/make_body(loc_spawn, datum/mind/mind, try_use_preference = FALSE, species_name = null, list/possible_species)
 	var/datum/character_save/character
-	var/mob/living/carbon/human/H = owner.current
+	var/mob/living/carbon/human/H = mind.current
 	if(!H)
 		H = new(loc_spawn)
 	else

diff --git a/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm b/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm
@@ -233,7 +233,7 @@
 /datum/antag_scenario/proc/make_character(datum/mind/mind, turf/loc_spawn)
 	var/picked_species = pick(possible_species)
 	var/datum/antagonist/temp_antag_datum = locate(antag_datum) in mind.antag_datums
-	temp_antag_datum.make_body(loc_spawn, TRUE, picked_species, possible_species)
+	temp_antag_datum.make_body(loc_spawn, mind, TRUE, picked_species, possible_species)
 
 /datum/antag_scenario/proc/equip_character(datum/mind/mind)
 	return TRUE

diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_outfit.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_outfit.dm
@@ -4,10 +4,10 @@
 	uniform = /obj/item/clothing/under/vox/jumpsuit
 	gloves = /obj/item/clothing/gloves/vox
 	shoes = /obj/item/clothing/shoes/roman/vox
-	mask = /obj/item/clothing/mask/breath/vox/respirator
 	l_ear = /obj/item/radio/headset/vox
 	id = /obj/item/card/id/syndicate/vox
 	l_pocket = /obj/item/melee/classic_baton/telescopic
+	//mask = /obj/item/clothing/mask/breath/vox/respirator
 	belt = /obj/item/tank/internals/emergency_oxygen/double/vox
 
 	back = /obj/item/storage/backpack/vox

diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_rig.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_rig.dm
@@ -42,8 +42,21 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	armor = list(MELEE = 75, BULLET = 50, LASER = 30, ENERGY = 20, BOMB = 25, RAD = 115, FIRE = 80, ACID = 200)
 
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon_state()
-	icon_state = "[initial(icon_state)][on]"
+/obj/item/clothing/head/helmet/space/hardsuit/vox/toggle_light(mob/user)
+	on = !on
+	icon_state = "[initial(icon_state)][on ? "_light" : ""]"
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_head()
+
+	if(on)
+		set_light(brightness_on)
+	else
+		set_light(0)
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
 
 // Space Trooper
 

diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm
@@ -163,7 +163,7 @@
 	return TRUE
 
 /obj/machinery/vox_trader/proc/do_trade(mob/user)
-	var/list/items_list = /get_trade_contents(user)
+	var/list/items_list = get_trade_contents(user)
 	INVOKE_ASYNC(src, PROC_REF(make_cash), user, items_list)
 
 /obj/machinery/vox_trader/proc/make_cash(mob/user, list/items_list)
@@ -468,26 +468,29 @@
 /obj/machinery/vox_trader/proc/get_trade_contents(mob/user)
 	var/turf/current_turf = get_turf(src)
 	var/list/items_list = current_turf.GetAllContents(7)
-	for(var/obj/O in items_list)
-		if(istype(O, /obj/item/organ))
-			var/obj/item/organ/organ = O
+	for(var/I in items_list)
+		if(istype(I, /obj/item/organ))
+			var/obj/item/organ/organ = I
 			if(organ.owner)
 				items_list.Remove(organ)
 			continue
-		if(isliving(O))
-			var/mob/living/M = O
+		if(isliving(I))
+			var/mob/living/M = I
 			items_list.Remove(M)
 			if(!isvox(M))
 				send_to_station(M)
 				continue
+			if(!M.mind)
+				continue
 			var/datum/antagonist/vox_raider/antag = locate() in M.mind.antag_datums
 			if(antag)
 				continue
 			for(var/datum/antagonist/A as anything in user.mind.antag_datums)
-				var/datum/team/team = user.get_team()
+				var/datum/team/team = A.get_team()
 				if(team)
 					team.add_member(M.mind, TRUE)
 					break
+	return items_list
 
 /obj/machinery/vox_trader/proc/send_to_station(mob/living/M)
 	M.Sleeping(16 SECONDS)
@@ -496,6 +499,6 @@
 	M.adjustFireLoss(-25)
 	M.adjustToxLoss(-50)
 	M.forceMove(pick(GLOB.latejoin))
-	if(iscarbon)
+	if(iscarbon(M))
 		var/mob/living/carbon/C = M
 		C.uncuff()
diff --git a/modular_ss220/antagonists/code/vox_raider/vox_raider_datum.dm b/modular_ss220/antagonists/code/vox_raider/vox_raider_datum.dm
@@ -140,11 +140,11 @@
 		return
 	for(var/datum/mind/mind in candidates_list)
 		if(!isvox(mind.current))
-			make_body(get_turf(src), TRUE, "Vox")
+			make_body(get_turf(src), mind, TRUE, "Vox")
 		var/mob/living/carbon/human/H = mind.current
 		if(mind.current)
 			H.equipOutfit(/datum/outfit/vox, visualsOnly)
 
-/datum/antagonist/vox_raider/make_body(spawn_loc, try_use_preference = FALSE, species_name = null, list/possible_species)
+/datum/antagonist/vox_raider/make_body(spawn_loc, datum/mind/mind, try_use_preference = FALSE, species_name = null, list/possible_species)
 	. = ..()
-	owner.store_memory("<B> Я Вокс-Рейдер, основа моя: беречь стаю, тащить ценности. </B>.")
+	mind.store_memory("<B> Я Вокс-Рейдер, основа моя: беречь стаю, тащить ценности. </B>.")