Merge branch 'PentestSS13:master' into stair-fix

README.md

@@ -4,19 +4,23 @@
 
 [![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
--   **Website:** <https://pentest.com.co>
--   **Pentest's Wiki (Needs Work!):** <https://pentest.com.co/wiki>
+-   **Website:** <https://web.pentest.com.co>
+-   **Pentest's Wiki (In maintenance):** **Coming soon!**
 -   **Shiptest's Code Docs:** <https://codedocs.shiptest.net>
 -   **Pentest's Discord:** <https://discord.gg/ydGPEejXZB>
 -   **Coderbus Discord:** <https://discord.gg/Vh8TJp9>
 
 This is Constellado's fork of Shiptest. 
 
-This was origially made because half of us is banned from shiptest or did not like how it was ran. A lot like the song banned from argo. It is also something bigger; a place where we can play our own characters how we want and have our own long term stories!
+Pentest is a 2D game built on BYOND in which you fly spaceships in a star system with your friends! Explore, find stuff, fight stuff, upgrade your ship with said stuff and roleplay a character!
 
-Named Pentest, based on the story of how a person got banned on shiptest for stealing a pen!
+This was origially made because half of us is banned from another server named Shiptest or did not like how it was ran. It is also something bigger; a place where we can play our own characters how we want and have our own long term stories!
 
-Pentest is a 2D game built on BYOND in which you fly spaceships in a star system with your friends! Explore, find stuff, fight stuff, upgrade your ship with said stuff and roleplay a character!
+Named Pentest, based on the story of how a person got banned on Shiptest for stealing a pen!
+
+|![image](https://github.com/user-attachments/assets/4bf03439-bf0b-4929-93e0-489d1629ff65) |
+|:--:| 
+| *Flying a ship* |
                     
 ## DOWNLOADING
 

_maps/configs/horizon_apis.json

@@ -48,7 +48,7 @@
 	},
 	"limit": 1,
 	"starting_funds": 2000,
-	"enabled": true,
+	"enabled": false,
 	"space_spawn": false,
 	"architect": "Blacklist897/Alexander Moore",
 	"contributors": [

_maps/shuttles/independent/horizon_apis.dmm

@@ -4874,20 +4874,12 @@
 /obj/effect/turf_decal/box,
 /obj/machinery/light/small/directional/north,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_box/magazine/gauss,
-/obj/item/ammo_box/magazine/gauss,
-/obj/item/ammo_box/magazine/gauss,
-/obj/item/ammo_box/magazine/gauss,
-/obj/item/gun/ballistic/automatic/powered/gauss{
-	name = "horizon prototype gauss rifle";
-	manufacturer = "Horizon RnD team Delta ";
-	desc = "An experimental rifle with a high capacity. Useful for putting down crowds. Chambered in ferromagnetic pellets."
-	},
-/obj/item/gun/ballistic/automatic/powered/gauss{
-	name = "horizon prototype gauss rifle";
-	manufacturer = "Horizon RnD team Delta ";
-	desc = "An experimental rifle with a high capacity. Useful for putting down crowds. Chambered in ferromagnetic pellets."
-	},
+/obj/item/gun/ballistic/automatic/powered/gauss/horizon,
+/obj/item/gun/ballistic/automatic/powered/gauss/horizon,
+/obj/item/ammo_box/magazine/gauss/horizon,
+/obj/item/ammo_box/magazine/gauss/horizon,
+/obj/item/ammo_box/magazine/gauss/horizon,
+/obj/item/ammo_box/magazine/gauss/horizon,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "QR" = (

_maps/shuttles/independent/independent_basilisk.dmm

@@ -2160,7 +2160,7 @@
 	icon_state = "1-4"
 	},
 /obj/structure/closet/secure_closet/wall/directional/east{
-	icon_state = "solgov_wall";
+	icon_state = "terragov_wall";
 	name = "Executive officer closet";
 	req_access_txt = "20";
 	pixel_y = -28;
@@ -4126,7 +4126,7 @@
 /area/ship/bridge)
 "zz" = (
 /obj/structure/closet/secure_closet/wall/directional/east{
-	icon_state = "solgov_wall";
+	icon_state = "terragov_wall";
 	name = "Firearm locker";
 	req_access_txt = "20";
 	pixel_y = 28;
@@ -5756,7 +5756,7 @@
 	desc = "The “iho-usks”, translating to “gear-holder”, is a lightweight harness covered in pouches, supplied to the ground troops of the Tiziran Royal Guard. This variant is designed for carrying ammunition."
 	},
 /obj/structure/closet/secure_closet/wall/directional/east{
-	icon_state = "solgov_wall";
+	icon_state = "terragov_wall";
 	name = "captain's closet";
 	req_access_txt = "20"
 	},

_maps/shuttles/independent/independent_wyvern.dmm

@@ -3749,7 +3749,7 @@
 /area/ship/engineering/atmospherics)
 "QQ" = (
 /obj/structure/closet/secure_closet/wall/directional/west{
-	icon_state = "solgov_wall";
+	icon_state = "terragov_wall";
 	name = "first mate's closet";
 	req_access_txt = "57"
 	},
@@ -3930,7 +3930,7 @@
 "SS" = (
 /obj/item/clothing/glasses/sunglasses,
 /obj/structure/closet/secure_closet/wall/directional/east{
-	icon_state = "solgov_wall";
+	icon_state = "terragov_wall";
 	name = "captain's closet";
 	req_access_txt = "20"
 	},

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -1807,7 +1807,7 @@
 /obj/item/codespeak_manual{
 	charges = 2
 	},
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/viper,
 /obj/item/megaphone/sec{
 	name = "syndicate megaphone"
 	},

code/controllers/configuration/entries/general.dm

@@ -239,7 +239,7 @@
 	config_entry_value = "https://github.com/tgstation/common_core"
 
 /datum/config_entry/string/rulesurl
-	config_entry_value = "https://pentest.com.co/rules.html"
+	config_entry_value = "https://web.pentest.com.co/rules.html"
 
 /datum/config_entry/string/githuburl
 	config_entry_value = "https://github.com/PentestSS13/Pentest"

code/game/objects/items/crayons.dm

@@ -43,15 +43,28 @@
 	var/drawtype
 	var/text_buffer = ""
 
-	var/static/list/graffiti = list("face","guy","end","body")
-	var/static/list/code = list("getout","empty","unsafe","camp","safepath","jackpot","dismantle")
-	var/static/list/symbols = list("danger","firedanger","electricdanger","biohazard","radiation","safe","evac","space","med","trade","shop","food","peace","like","skull","nay","heart","credit")
-	var/static/list/drawings = list("smallbrush","brush","splatter","snake","carp","ghost","taser","disk","fireaxe","toolbox","corgi","cat","toilet","blueprint","beepsky","scroll","bottle","shotgun")
-	var/static/list/oriented = list("arrow","line","thinline","shortline","body","chevron","footprint","clawprint","pawprint","dogo","nogo") // These turn to face the same way as the drawer
+	var/static/list/graffiti = list(
+		"face","guy","end","body","amyjon","antilizard","cyka","dwarf","engie","matt","prolizard","revolution","star","uboa","Omni","Newton","Clandestine","Prima","Zero-G","Osiron","Psyke","Diablo","Blasto","North","Donk","Sleeping Carp","Gene","Cyber","Tunnel","Sirius","Waffle","Max","Gib"
+	)
+	var/static/list/code = list(
+		"getout","empty","unsafe","camp","safepath","jackpot","dismantle"
+	)
+	var/static/list/symbols = list(
+		"danger","firedanger","electricdanger","biohazard","radiation","safe","evac","space","med","trade","shop","food","peace","like","skull","nay","heart","credit"
+	)
+	var/static/list/drawings = list(
+		"largebrush","smallbrush","brush","splatter","snake","carp","ghost","taser","disk","fireaxe","toolbox","corgi","cat","clown","toilet","blueprint","beepsky","scroll","bottle","shotgun","stickman"
+	)
+	var/static/list/oriented = list(
+		"arrow","line","thinline","shortline","body","chevron","footprint","clawprint","pawprint","dogo","nogo"
+	) // These turn to face the same way as the drawer
+	var/static/list/runes = list(
+		"rune1","rune2","rune3","rune4","rune5","rune6"
+	)
 	var/static/list/randoms = list(RANDOM_ANY, RANDOM_RUNE, RANDOM_ORIENTED,
 		RANDOM_NUMBER, RANDOM_GRAFFITI, RANDOM_LETTER, RANDOM_SYMBOL, RANDOM_PUNCTUATION, RANDOM_DRAWING)
 
-	var/static/list/all_drawables = graffiti + code + symbols + drawings + oriented
+	var/static/list/all_drawables = graffiti + code + symbols + drawings + oriented + runes
 
 	var/paint_mode = PAINT_NORMAL
 
@@ -302,6 +315,8 @@
 			drawing = pick(graffiti)
 		if(RANDOM_ORIENTED)
 			drawing = pick(oriented)
+		if(RANDOM_RUNE)
+			drawing = pick(runes)
 		if(RANDOM_NUMBER)
 			drawing = ascii2text(rand(48, 57)) // 0-9
 		if(RANDOM_ANY)

code/game/objects/structures/crates_lockers/closets/wallmount.dm

@@ -19,7 +19,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/red, 28)
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/orange, 28)
 
 /obj/structure/closet/wall/blue
-	icon_state = "solgov_wall"
+	icon_state = "terragov_wall"
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/blue, 28)
 

code/modules/clothing/masks/miscellaneous.dm

@@ -70,7 +70,7 @@
 	icon_state = "joy"
 
 /obj/item/clothing/mask/spamton
-	name = "Cursed Businessman's Mask"
+	name = "Businessman's Mask"
 	icon_state = "big_shot"
 	item_state = "big_shot"
 	clothing_flags = ALLOWINTERNALS
@@ -86,14 +86,11 @@
 /obj/item/clothing/mask/spamton/attack_self(mob/user)
 	if(cooldown < world.time)
 		SSblackbox.record_feedback("amount", "saving_uses", 1)
-		cooldown = world.time + 1600
+		cooldown = world.time + 2600
 		var/mob/living/U = user
-		U.apply_damage(25, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-		to_chat(user, "<span class='warning'>BLOOD PRICE ACCEPTED. WITHDRAWING KRONOR FROM OFFSHORE FUND...</span>")
-		pick(
-						new /obj/item/spacecash/bundle/mediumrand(user.drop_location()),
-						new /obj/item/spacecash/bundle/smallrand(user.drop_location()),
-						new /obj/item/holochip(user.drop_location(), 5000))
+		U.apply_damage(15, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
+		to_chat(user, "<span class='warning'>BLOOD PRICE ACCEPTED. WITHDRAWING CREDITS FROM OFFSHORE FUND...</span>")
+		new /obj/item/holochip(user.drop_location(), 50)
 	else
 		to_chat(user, "<span class='warning'>[src]'s savings account can't yet be accessed!</span>")
 
@@ -114,10 +111,6 @@
 
 	speech_args[SPEECH_MESSAGE] = trim(message)
 
-/obj/item/clothing/mask/spamton/Initialize()
-	. = ..()
-	ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
-
 /obj/item/clothing/mask/pig
 	name = "pig mask"
 	desc = "A rubber pig mask with a built-in voice modulator."

html/changelogs/AutoChangeLog-pr-102.yml

@@ -0,0 +1,4 @@
+author: Blacklist897
+changes:
+  - {rscdel: Apis disabled}
+delete-after: true

html/changelogs/AutoChangeLog-pr-106.yml

@@ -0,0 +1,4 @@
+author: Ossa88
+changes:
+  - {bugfix: Rules links to rules}
+delete-after: true

html/changelogs/AutoChangeLog-pr-78.yml

@@ -0,0 +1,4 @@
+author: Blacklist897, Kuma
+changes:
+  - {rscadd: A strange model of magnetic weapon has been spotted in the sector}
+delete-after: true

html/changelogs/AutoChangeLog-pr-82.yml

@@ -0,0 +1,5 @@
+author: Ossa88
+changes:
+  - {bugfix: Terragov lockers are no longer cloaked.}
+  - {bugfix: Solgov lockers removed from code.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-84.yml

@@ -0,0 +1,5 @@
+author: Ossa88
+changes:
+  - {rscadd: More Graffiti}
+  - {bugfix: Restores the Runes for the Random Rune button.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-92.yml

@@ -0,0 +1,4 @@
+author: Constellado
+changes:
+  - {bugfix: fixes the shotgun in the fast food ruin}
+delete-after: true

html/changelogs/AutoChangeLog-pr-96.yml

@@ -0,0 +1,4 @@
+author: Constellado
+changes:
+  - {balance: Umbrellas no longer have razor blades as fabric.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-97.yml

@@ -0,0 +1,6 @@
+author: Constellado
+changes:
+  - {balance: "The cursed businessman's bank account is no longer extensive, and has
+      had its curse dispelled."}
+  - {bugfix: The business man's mask now replaces all the proper words.}
+delete-after: true

html/changelogs/AutoChangeLog-pr-99.yml

@@ -0,0 +1,5 @@
+author: Ossa88
+changes:
+  - {bugfix: Twinkleshine Revolver Fix}
+  - {bugfix: Wasteplanet Revolver Fix}
+delete-after: true

modular_pentest/_maps/ruins_space/Fast_Food.dmm

@@ -1054,13 +1054,13 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered/macspace)
 "cm" = (
-/obj/item/gun/ballistic/shotgun,
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 2
 	},
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/powered/macspace)
 "cn" = (

modular_pentest/_maps/ruins_wasteplanet/wasteplanet_tarcity.dmm

@@ -899,7 +899,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/mateba,
 /turf/open/floor/concrete,
 /area/ruin/unpowered)
 "uk" = (

modular_pentest/modules/faction_horizon/code/horizon_gauss.dm

@@ -0,0 +1,35 @@
+/obj/item/gun/ballistic/automatic/powered/gauss/horizon
+	name = "Horizon 'Bardiche' gauss rifle"
+	desc = "A magnetic rifle produced by Horizons RnD team Delta, adapted from Nanotrasen Blueprints."
+	icon = 'modular_pentest/modules/faction_horizon/icons/horizon_gauss.dmi'
+	icon_state = "gauss_horizon"
+	item_state = "arg"
+	slot_flags = 0
+	mag_type = /obj/item/ammo_box/magazine/gauss/horizon
+	fire_sound = 'sound/weapons/gun/gauss/magrifle.ogg'
+	load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
+	burst_size = 1
+	fire_delay = 0.3 SECONDS
+	spread = 0
+	show_magazine_on_sprite = TRUE
+	empty_indicator = TRUE
+	weapon_weight = WEAPON_MEDIUM
+	w_class = WEIGHT_CLASS_BULKY
+	charge_sections = 4
+	ammo_x_offset = 2
+	manufacturer = MANUFACTURER_NONE
+
+	spread = 0
+	spread_unwielded = 25
+	recoil = 0
+	recoil_unwielded = 4
+	wield_slowdown = 0.75
+	wield_delay = 1 SECONDS
+	fire_select_icon_state_prefix = "lance_"
+
+/obj/item/ammo_box/magazine/gauss/horizon
+	name = "gauss magazine (ferromagnetic lances)"
+	desc = "A 20-round magazine for the horizon gauss rifle. Ferromagnetic lances do good damage with significant armor penetration."
+	ammo_type = /obj/item/ammo_casing/caseless/gauss/lance
+	caliber = "lance"
+	max_ammo = 20

modular_pentest/modules/umbrella/code/umbrellas.dm

@@ -15,9 +15,12 @@
 	lefthand_file = 'modular_pentest/modules/umbrella/icons/umbrellas_inhand_lh.dmi'
 	righthand_file = 'modular_pentest/modules/umbrella/icons/umbrellas_inhand_rh.dmi'
 
-	force = 5
+	force = 10
+	force_on = 5 //does more force when closed, duh.
 	throwforce = 5
+	throwforce_on = 3 // when open, it has more air resistance
 	w_class = WEIGHT_CLASS_SMALL
+	hitsound_on = 'sound/weapons/fwoosh.ogg'
 	attack_verb = list("bludgeon", "whack", "discipline", "pummel")
 	attack_verb_on = list("swooshes", "whacks", "fwumps")
 	attack_verb_off = list("bludgeon", "whack", "discipline", "pummel")
@@ -26,7 +29,7 @@
 	sharpness = IS_BLUNT
 	w_class_on = WEIGHT_CLASS_BULKY
 	clumsy_check = FALSE
-	throwforce_on = 3
+
 
 	//open umbrella offsets for the inhands
 	var/open_x_offset = 2
@@ -87,7 +90,7 @@
 //other umbrellas
 /obj/item/melee/transforming/umbrella/parasol
 	name = "parasol"
-	desc = "A black laced parsol, how intricate."
+	desc = "A black laced parasol, how intricate."
 	icon_state = "parasol"
 	on_inhand_icon_state = "parasol_on"
 	icon_state_on = "parasol_on"

modular_pentest/modules/umbrella/readme.md

@@ -2,6 +2,7 @@
 
 https://github.com/PentestSS13/Pentest/pull/4
 https://github.com/PentestSS13/Pentest/pull/11
+https://github.com/PentestSS13/Pentest/pull/96
 
 ## \<Title Here> Umbrellas
 
@@ -13,7 +14,7 @@ Adds Umbrellas
 
 ### Shiptest Proc/File Changes:
 
-- N/A
+- loudout_general.dm
 
 ### Modular Overrides:
 
@@ -25,6 +26,7 @@ Adds Umbrellas
 
 ### Map additions
 - N/A
+
 ### Included files that are not contained in this module:
 
 - N/A

shiptest.dme

@@ -3608,6 +3608,7 @@
 #include "modular_pentest\_maps\ruins_wasteplanet\_areas_wasteplanet.dm"
 #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm"
 #include "modular_pentest\_maps\ships\_areas_ships.dm"
+#include "modular_pentest\modules\faction_horizon\code\horizon_gauss.dm"
 #include "modular_pentest\modules\hair_styles\code\hair.dm"
 #include "modular_pentest\modules\pi_items\code\clothing.dm"
 #include "modular_pentest\modules\pi_items\code\flooring_decals.dm"