changed player minimum age for some jobs, fixed amara fluff stuff, adding fluff boxes. Sergal speed +++, Blade borg now got mining stuff, all borgs got pounce module.

2025-12-10 10:12:45 +00:00 · 2017-01-01 17:03:25 -05:00
parent 6c83484edb
commit d6afef56a9
11 changed files with 39 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,16 @@ code/game/gamemodes/technomancer/spells/projectile/overload.dm
 code/game/gamemodes/technomancer/spells/projectile/overload.dm
 code/modules/client/preference_setup/loadout/loadout_xeno.dm
 /maps/RandomZLevels/backup/blackmarketpackers.dmm
+/maps/backup/virgo-1.dmm
+/maps/backup/virgo-2.dmm
+/tools/midi2piano/.vs/midi2piano/v14/.suo
+/tools/midi2piano/midi2piano/bin/x86/Debug/Sanford.Multimedia.Midi.dll
+/tools/midi2piano/midi2piano/bin/x86/Debug/midi2piano.exe
+/tools/midi2piano/midi2piano/bin/x86/Debug/midi2piano.pdb
+/tools/midi2piano/midi2piano/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.Form1.resources
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csproj.FileListAbsolute.txt
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csproj.GenerateResource.Cache
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csprojResolveAssemblyReference.cache
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.exe
+/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.pdb
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -66,6 +66,7 @@
 	minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
 	alt_titles = list("Maintenance Technician","Engine Technician","Electrician")

+	minimal_player_age = 3

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -59,7 +59,7 @@
 	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
 	alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher")

-	minimal_player_age = 14
+	minimal_player_age = 2

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -91,7 +91,7 @@
 	minimal_access = list(access_research, access_xenobiology, access_hydroponics, access_tox_storage)
 	alt_titles = list("Xenobotanist")

-	minimal_player_age = 14
+	minimal_player_age = 2

 	equip(var/mob/living/carbon/human/H)
 		if(!H) return 0
@@ -123,7 +123,7 @@
 	minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
 	alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")

-	minimal_player_age = 7
+	minimal_player_age = 2

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -16,6 +16,7 @@
 	var/help = 0
 	var/edit = 1
 	var/repeat = 0
+	var/linelimit = 50

 /obj/structure/device/piano/New()
 	if(prob(50))
@@ -392,9 +393,9 @@
 				if(copytext(lines[1],1,6) == "BPM: ")
 					tempo = 600 / text2num(copytext(lines[1],6))
 					lines.Cut(1,2)
-				if(lines.len > 50)
+				if(lines.len > linelimit)
 					usr << "Too many lines!"
-					lines.Cut(51)
+					lines.Cut(linelimit+1)
 				var/linenum = 1
 				for(var/l in lines)
 					if(lentext(l) > 50)
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -6,12 +6,12 @@
 	tail = "tail"
 	icobase_tail = 1
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
-	//darksight = 8
-	//slowdown = -0.5
+	darksight = 8
+	slowdown = -1
 	//brute_mod = 1.15
 	//burn_mod =  1.15
 	//gluttonous = 1
-	num_alternate_languages = 2
+	num_alternate_languages =
 	secondary_langs = list("Sagaru")
 	name_language = "Sagaru"
 	color_mult = 1
--- a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm
@@ -26,6 +26,7 @@
 	src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
 	src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) //They /are/ a security borg, after all.
 	src.modules += new /obj/item/borg/sight/hud/sec(src) //Security hud to see criminals.
+	src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
 	src.emag 	 = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
@@ -72,6 +73,7 @@
 	src.modules += new /obj/item/borg/sight/hud/med(src) //See who's hurt generally.
 	src.modules += new /obj/item/weapon/extinguisher/mini(src) //So they can put burning patients out.
 	src.modules += new /obj/item/weapon/reagent_containers/syringe(src) //In case the chemist is nice!
+	src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
 	R.icon = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
 	//R.icon_state = "medihound"
@@ -99,6 +101,7 @@
 	src.modules += new /obj/item/borg/sight/hud/sec(src)
 	src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun(src)
 	src.modules += new /obj/item/weapon/dogborg/swordtail(src)
+	src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
 	src.emag     = new /obj/item/weapon/gun/energy/laser/mounted(src)
 	R.icon 		 = 'icons/mob/62x62robot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
--- a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
@@ -31,21 +31,25 @@
 					"Blade" = "blade",
 					)
 	channels = list("Security" = 1)
-	networks = list(NETWORK_SECURITY)
+	networks = list(NETWORK_MINE)
 	can_be_pushed = 0

 /obj/item/weapon/robot_module/blade/New(var/mob/living/silicon/robot/R)
 	src.modules += new /obj/item/device/flash(src)
-	src.modules += new /obj/item/weapon/handcuffs/cyborg(src) //You need cuffs to be a proper sec borg!
 	src.modules += new /obj/item/weapon/dogborg/jaws/big(src) //In case there's some kind of hostile mob.
-	src.modules += new /obj/item/weapon/melee/baton/robot(src) //Since the pounce module refused to work, they get a stunbaton instead.
 	src.modules += new /obj/item/device/dogborg/boop_module(src) //Boop people on the nose.
 	src.modules += new /obj/item/device/dogborg/tongue(src) //This is so they can clean up bloody evidence after it's examined, and so they can lick crew.
-	src.modules += new /obj/item/taperoll/police(src) //Block out crime scenes.
 	src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
-	src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) //They /are/ a security borg, after all.
-	src.modules += new /obj/item/borg/sight/hud/sec(src) //Security hud to see criminals.
 	src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
+	src.modules += new /obj/item/borg/sight/material(src)
+	src.modules += new /obj/item/weapon/wrench(src)
+	src.modules += new /obj/item/weapon/screwdriver(src)
+	src.modules += new /obj/item/weapon/storage/bag/ore(src)
+	src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
+	src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
+	src.modules += new /obj/item/weapon/gripper/miner(src)
+	src.modules += new /obj/item/weapon/mining_scanner(src)
+	src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
 	src.emag 	 = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -290,8 +290,8 @@
 	item_state = "tgloves_mob"

 /obj/item/clothing/under/fluff/amara_faell_4
-	name = "Sleeveless sweater"
-	desc = "A gray sleeveless turtleneck-sweater and a pair of damaged camo pants."
+	name = "Skintight bodysuit"
+	desc = "A black-red bodysuit made of some durable synthetic material. Kinda kinky."
 	icon = 'icons/vore/custom_clothes_yw.dmi'
 	icon_state = "stnecksuit"
 	icon_override = 'icons/vore/custom_clothes_yw.dmi'
--- a/icons/vore/custom_clothes_yw.dmi
+++ b/icons/vore/custom_clothes_yw.dmi
--- a/tools/midi2piano/midi2piano/Form1.cs
+++ b/tools/midi2piano/midi2piano/Form1.cs
@@ -241,7 +241,7 @@ namespace midi2piano
                {
                    output += line.Substring(0, line.Length - 1) + "\r\n";
                    line = "";
-                    if (lineCount == 50)
+                    if (lineCount == 500)
                        break;
                    lineCount++;
                }
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2185,7 +2185,6 @@
 #include "code\modules\vore\fluffstuff\custom_items_yw.dm"
 #include "code\modules\vore\fluffstuff\custom_permits_vr.dm"
 #include "code\modules\vore\fluffstuff\MadokaSpear.dm"
-#include "code\modules\vore\fluffstuff\nazirus_yw.dm"
 #include "code\modules\vore\resizing\grav_pull_vr.dm"
 #include "code\modules\vore\resizing\holder_micro_vr.dm"
 #include "code\modules\vore\resizing\resize_vr.dm"