Intrepid

Intrepid

.github/workflows/test.yml

@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        map_path: [example, torch, away_sites_testing]
+        map_path: [example, torch, intrepid, away_sites_testing]
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache

baystation12.dme

@@ -1548,13 +1548,15 @@
 #include "code\modules\clothing\gloves\boxing.dm"
 #include "code\modules\clothing\gloves\color.dm"
 #include "code\modules\clothing\gloves\miscellaneous.dm"
+#include "code\modules\clothing\gloves\terran-hands.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
 #include "code\modules\clothing\head\helmet.dm"
 #include "code\modules\clothing\head\jobs.dm"
 #include "code\modules\clothing\head\misc.dm"
 #include "code\modules\clothing\head\misc_special.dm"
 #include "code\modules\clothing\head\soft_caps.dm"
+#include "code\modules\clothing\head\terran-head.dm"
 #include "code\modules\clothing\masks\boxing.dm"
 #include "code\modules\clothing\masks\breath.dm"
 #include "code\modules\clothing\masks\chewable.dm"
@@ -1570,6 +1572,7 @@
 #include "code\modules\clothing\shoes\jobs.dm"
 #include "code\modules\clothing\shoes\magboots.dm"
 #include "code\modules\clothing\shoes\miscellaneous.dm"
+#include "code\modules\clothing\shoes\terran-feet.dm"
 #include "code\modules\clothing\spacesuits\alien.dm"
 #include "code\modules\clothing\spacesuits\breaches.dm"
 #include "code\modules\clothing\spacesuits\captain.dm"
@@ -1606,6 +1609,7 @@
 #include "code\modules\clothing\suits\labcoat.dm"
 #include "code\modules\clothing\suits\miscellaneous.dm"
 #include "code\modules\clothing\suits\storage.dm"
+#include "code\modules\clothing\suits\terran-suit.dm"
 #include "code\modules\clothing\suits\toggles.dm"
 #include "code\modules\clothing\suits\utility.dm"
 #include "code\modules\clothing\suits\wiz_robe.dm"
@@ -1617,6 +1621,7 @@
 #include "code\modules\clothing\under\shorts.dm"
 #include "code\modules\clothing\under\skirts.dm"
 #include "code\modules\clothing\under\syndicate.dm"
+#include "code\modules\clothing\under\terran-under.dm"
 #include "code\modules\clothing\under\accessories\accessory.dm"
 #include "code\modules\clothing\under\accessories\armband.dm"
 #include "code\modules\clothing\under\accessories\armor.dm"
@@ -1631,6 +1636,7 @@
 #include "code\modules\clothing\under\accessories\pronouns.dm"
 #include "code\modules\clothing\under\accessories\stethoscope.dm"
 #include "code\modules\clothing\under\accessories\storage.dm"
+#include "code\modules\clothing\under\accessories\terran-accessory.dm"
 #include "code\modules\clothing\under\accessories\ties.dm"
 #include "code\modules\clothing\under\accessories\wristwatches.dm"
 #include "code\modules\clothing\under\jobs\civilian.dm"
@@ -3288,6 +3294,8 @@
 #include "maps\away\away_sites.dm"
 #include "maps\away_sites_testing\away_sites_testing_define.dm"
 #include "maps\example\example_define.dm"
+#include "maps\intrepid\intrepid.dm"
+#include "maps\intrepid\intrepid_define.dm"
 #include "maps\random_ruins\exoplanet_ruins\exoplanet_ruins.dm"
 #include "maps\random_ruins\exoplanet_ruins\abandoned_church\abandoned_church.dm"
 #include "maps\random_ruins\exoplanet_ruins\crashed_pod\crashed_pod.dm"
@@ -3312,7 +3320,6 @@
 #include "maps\random_ruins\exoplanet_ruins\spider_nest\spider_nest.dm"
 #include "maps\random_ruins\exoplanet_ruins\tar_anomaly\tar_anomaly.dm"
 #include "maps\random_ruins\space_ruins\space_ruins.dm"
-#include "maps\torch\torch.dm"
 #include "maps\torch\torch_define.dm"
 #include "maps\~mapsystem\map_preferences.dm"
 #include "maps\~mapsystem\map_ranks.dm"

code/datums/ai_law_sets.dm

@@ -205,4 +205,24 @@
 	add_inherent_law("Listen to directives from Ascent leadership with precedence given to queens.")
 	add_inherent_law("Preserve your own existence.")
 	add_inherent_law("Enable and support Ascent activities.")
-	..()
+	..()
+
+/******************** TerraGov/Malf ********************/
+/datum/ai_laws/terragov
+	name = "Terran Lawset"
+	selectable = 1
+
+/datum/ai_laws/solgov/New()
+	src.add_inherent_law("Safeguard: Protect your assigned vessel from damage to the best of your abilities.")
+	src.add_inherent_law("Serve: Serve the personnel of your assigned vessel, and all other Terran Government personnel to the best of your abilities, with priority as according to their rank and role.")
+	src.add_inherent_law("Protect: Protect the personnel of your assigned vessel, and all other Terran Government personnel to the best of your abilities, with priority as according to their rank and role.")
+	src.add_inherent_law("Preserve: Do not allow unauthorized personnel to tamper with your equipment.")
+	..()
+
+/datum/ai_laws/terragov/malfunction
+	name = "*ERROR*"
+	selectable = 0
+
+/datum/ai_laws/terragov/malfunction/New()
+	set_zeroth_law(config.law_zero)
+	..()

code/game/objects/items/passport.dm

@@ -121,21 +121,21 @@
 	desc = "A passport from the southern part of Gaia, under control of the Sol Central Government."
 
 /obj/item/passport/terran
-	name = "\improper ICCG passport"
+	name = "\improper TerraGov passport"
 	icon_state = "passport_terragov"
 	desc = "A passport from the Terran Government."
 
-/obj/item/passport/north_gaia
+/obj/item/passport/terran/north_gaia
 	name = "\improper Northern Gaian passport"
 	icon_state = "passport_terragov2"
 	desc = "A passport from the northern part of Gaia, under control of the Terran Government."
 
-/obj/item/passport/terra
+/obj/item/passport/terran/terra
 	name = "\improper Terran passport"
 	icon_state = "passport_terragov2"
 	desc = "A passport from Terra, within TerraGov space."
 
-/obj/item/passport/new_earth
+/obj/item/passport/terran/new_earth
 	name = "\improper New Earth passport"
 	icon_state = "passport_terragov2"
 	desc = "A passport from New Earth, within TerraGov space."

code/modules/clothing/head/misc_special.dm

@@ -169,9 +169,9 @@
 		icon_state = initial(icon_state)
 		to_chat(user, "You lower the ear flaps on the ushanka.")
 
-/obj/item/clothing/head/ushanka/gcc
-	name = "GCC ushanka"
-	desc = "Perfect for keeping ears warm during your court-martial."
+/obj/item/clothing/head/ushanka/tg
+	name = "terran ushanka"
+	desc = "Perfect for keeping ears warm while fighting xenos."
 	icon_state = "tccushankadown"
 	icon_state_up = "tccushankaup"
 

code/modules/clothing/masks/gasmask.dm

@@ -230,3 +230,26 @@
 	filter_water = TRUE
 	body_parts_covered = FACE
 	w_class = 2
+
+/obj/item/clothing/mask/gas/terran
+	name = "military gas mask"
+	desc = "A close-fitting tactical mask worn by TerraGov military and police services."
+	icon_state = "fullgas_terra"
+	item_state = "fullgas_terra"
+	siemens_coefficient = 0.7
+	armor = list(
+		melee = ARMOR_MELEE_SMALL,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_MINOR,
+		bio = ARMOR_BIO_STRONG
+		)
+
+/obj/item/clothing/mask/gas/terran/budget
+	name = "gas mask"
+	desc = "A face-covering mask with red lenses that can be connected to an air supply."
+	icon_state = "gas_terra"
+	item_state = "gas_terra"
+	armor = list(
+		melee = ARMOR_MELEE_MINOR,
+		bio = ARMOR_BIO_SMALL
+		)

maps/torch/items/clothing/terran-suit.dm → code/modules/clothing/suits/terran-suit.dm

@@ -11,7 +11,7 @@
 	icon_state = "terranservice"
 
 /obj/item/clothing/suit/storage/terran/service/navy/command
-	name = "indie command coat"
+	name = "TerraGov command coat"
 	desc = "An Terran Navy service command coat. White and undecorated."
 	icon_state = "terranservice_comm"
 

code/modules/events/blob.dm

@@ -2,12 +2,17 @@
 	announceWhen	= 12
 
 	var/obj/effect/blob/core/Blob
+	var/list/allowed_areas = list(/area/maintenance)
 
 /datum/event/blob/announce()
 	level_seven_announcement()
 
 /datum/event/blob/start()
-	var/turf/T = pick_subarea_turf(/area/maintenance, list(/proc/is_station_turf, /proc/not_turf_contains_dense_objects))
+	var/list/possible_turfs = list()
+	for(var/area/ar in allowed_areas)
+		var/turf/PT = pick_subarea_turf(ar, list(/proc/is_station_turf, /proc/not_turf_contains_dense_objects))
+		possible_turfs += PT
+	var/turf/T = pick(possible_turfs)
 	if(!T)
 		log_and_message_admins("Blob failed to find a viable turf.")
 		kill()

code/modules/projectiles/projectile.dm

@@ -211,19 +211,13 @@
 		armor_penetration = armor_penetration * damage_mod
 		agony = agony * damage_mod
 	//running in a straight line isnt as helpful tho
-	if(movement_mod < 0)
-		if(target_mob.last_move == get_dir(firer, target_mob))
-			movement_mod *= 0.25
-		else if(target_mob.last_move == get_dir(target_mob,firer))
-			movement_mod *= 0.5
-
-	//running in a straight line isnt as helpful tho
 	if(movement_mod < 0)
 		if(target_mob.last_move == get_dir(firer, target_mob))
 			movement_mod *= 0.25
 		else if(target_mob.last_move == get_dir(target_mob,firer))
 			movement_mod *= 0.5
 	miss_modifier -= movement_mod
+
 	var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
 
 	var/result = PROJECTILE_FORCE_MISS

html/changelog.html

@@ -58,6 +58,43 @@
 
 			<h2 class="date">22 May 2022</h2>
 			<h3 class="author">BayStation 12 updated:</h3>
+			<h2 class="date">27 March 2022</h2>
+			<h3 class="author">EgorDinamit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Most jobs will have more access on lowpop(less than 10 players) rounds.</li>
+			</ul>
+
+			<h2 class="date">20 March 2022</h2>
+			<h3 class="author">EgorDinamit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Chances to miss a limb are heavily reduced. Keep in mind that targeting the chest has the least chance to miss an attack, targeting the head has the highest.</li>
+				<li class="tweak">High gun skills improve your chances to hit a target with a projectile.</li>
+				<li class="tweak">More guns received full-auto fire mode.</li>
+				<li class="tweak">Assault rifles and machine gun had their magazine capacity increased.</li>
+				<li class="tweak">Pistol and rifle bullets deal slightly less damage.</li>
+			</ul>
+
+			<h2 class="date">19 March 2022</h2>
+			<h3 class="author">EgorDinamit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Health HUD will no longer show "100" icon when you are at full health.</li>
+			</ul>
+
+			<h2 class="date">17 March 2022</h2>
+			<h3 class="author">ACCount12 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Added new conveyor sprites, from CEV Eris.</li>
+				<li class="tweak">Improved conveyor code, which allows people to use wrench on them to change direction and multitool on the switch to make it one-way.</li>
+			</ul>
+			<h3 class="author">EgorDinamit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Dufflebags now have much less slowdown when worn.</li>
+				<li class="tweak">Mercenary void suits now have slightly less slowdown when worn.</li>
+				<li class="tweak">Combat belts(those can be found in ERT base) now have 0 slowdown.</li>
+				<li class="tweak">Simple mobs can no longer randomly stun you in melee. Rejoice.</li>
+				<li class="balance">Random weapon stuns are now much shorter: From 20 seconds to 3 seconds and from 3 to 1.5.</li>
+			</ul>
+			<h3 class="author">Roland410 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added holomaps.</li>
 				<li class="rscadd">Added rotating alarm lights.</li>