Update to latest branch since closed source.

baystation12.dme

@@ -2468,6 +2468,7 @@
 #include "code\modules\xenoarcheaology\effects\heal.dm"
 #include "code\modules\xenoarcheaology\effects\heat.dm"
 #include "code\modules\xenoarcheaology\effects\hurt.dm"
+#include "code\modules\xenoarcheaology\effects\radiate.dm"
 #include "code\modules\xenoarcheaology\effects\roboheal.dm"
 #include "code\modules\xenoarcheaology\effects\robohurt.dm"
 #include "code\modules\xenoarcheaology\effects\sleepy.dm"

code/game/gamemodes/objective.dm

@@ -417,7 +417,9 @@ datum/objective/steal
 		"the nuke disk pinpointer" = /obj/item/weapon/pinpointer,
 		"the SCP-500 pill bottle" = /obj/item/weapon/storage/pill_bottle/scp500,
 		"SCP-113" = /obj/item/device/scp113,
-		"SCP-513" = /obj/item/scp513
+		"SCP-513" = /obj/item/scp513,
+		"the documentation of SCP-939" = /obj/item/weapon/paper/scp/keter/scp939,
+		"the documentation of SCP-106" = /obj/item/weapon/paper/scp/keter/scp106
 	)
 
 	var/global/possible_items_special[] = list(

code/modules/SCP/SCPs/SCP-999.dm

@@ -38,17 +38,21 @@
 	update_icon()
 	if(attached)
 		forceMove(attached.loc)
-		if(last_healing[attached] == null || ((last_healing[attached] + 5 MINUTES) >= world.time))
+		if(last_healing[attached] == null || ((last_healing[attached] + 2 MINUTES) >= world.time))
 			last_healing[attached] = world.time
 			if(attached_mode == HUGGING)
-				attached.reagents.add_reagent(/datum/reagent/bicaridine, 5)
-				attached.reagents.add_reagent(/datum/reagent/kelotane, 5)
-				attached.reagents.add_reagent(/datum/reagent/tramadol, 5)
+				attached.adjustOxyLoss(rand(20,30))
+				attached.adjustToxLoss(rand(20,30))
+				attached.adjustBruteLoss(rand(20,30))
+				attached.adjustFireLoss(rand(20, 30))
+				attached.adjustHalLoss(-200)
 				to_chat(attached, "<span class='notice'>You feel your wounds grow numb...</span>")
+				attached.emote(pick("laugh","giggle","smile","grin"))
 			else
-				if(prob(2.5))
+				if(prob(20))
 					attached.Stun(3)
 					visible_message("<span class='warning'>[src] wraps around [attached]'s legs, immobilizing them!</span>")
+					attached.emote(pick("laugh","giggle","smile","grin"))
 
 /mob/living/simple_animal/scp_999/UnarmedAttack(atom/a)
 	if(ishuman(a))

code/modules/admin/topic.dm

@@ -26,7 +26,7 @@
 			return
 
 //		var/choice = input("Which autoresponse option do you want to send to the player?\n\n L - A webpage link.\n A - An answer to a common question.", "Autoresponse", "--CANCEL--") in list ("--CANCEL--", "IC Issue", "Being Handled", "Fixed", "Thanks", "Guilty", "L: Xeno Quickstart Guide", "L: Marine quickstart guide", "L: Current Map", "A: No plasma regen", "A: Devour as Xeno", "J: Job bans", "E: Event in progress", "R: Radios", "D: Joining disabled", "M: Macros")
-		var/choice = input("Which autoresponse option do you want to send to the player?\n\n L - A webpage link.\n A - An answer to a common question.", "Autoresponse", "--CANCEL--") in list ("--CANCEL--", "IC Issue", "Being Handled", "Fixed","Thanks!", "A: GitHub Issue", "A: Becoming an SCP", "A: RUST Engine", "A: D-Class Riot", "A: D-Class Cells", "A: Directions/Lost", "A: Character setup", "LION ONLY: God damnit Cyclus!")
+		var/choice = input("Which autoresponse option do you want to send to the player?\n\n L - A webpage link.\n A - An answer to a common question.", "Autoresponse", "--CANCEL--") in list ("--CANCEL--", "IC Issue", "Being Handled", "Fixed","Thanks!", "A: GitHub Issue", "A: Becoming an SCP", "A: RUST Engine", "A: D-Class Riot", "A: D-Class Cells", "A: Directions/Lost", "A: Character setup", "A: Website and Discord information")
 
 
 		var/msgplayer
@@ -53,8 +53,8 @@
 				msgplayer = "\blue <b>NOTICE: <font color=red>[usr.key]</font> is autoresponding with <font color='#009900'>'[choice]'</font>. If you are lost, it is best to keep an eye on directional signs, ask a fellow player or find Holomaps, if they have been added to the current map.</b>"
 			if("A: Character setup")
 				msgplayer = "\blue <b>NOTICE: <font color=red>[usr.key]</font> is autoresponding with <font color='#009900'>'[choice]'</font>. In order to join the game, you are required to select a branch and rank, found in the top area of the character set up. Once you have done this, you can join the jobs that are allowed for that rank. It is best to experiment for a moment to see which rank suits you best, since some jobs allow multiple.</b>"
-			if("LION ONLY: God damnit Cyclus!")
-				msgplayer = "\blue <b>NOTICE: <font color=red>[usr.key]</font> is autoresponding with <font color='#009900'>'[choice]'</font>. Nobody gives a fuck about D-Class and not being able to breathe, Cyclus!</b>"
+			if("A: Website and Discord information")
+				msgplayer = "\blue <b>NOTICE: <font color=red>[usr.key]</font> is autoresponding with <font color='#009900'>'[choice]'</font>. Hello, and welcome! Our website is located at: https://scp13.site, our wiki is located at: wiki.scp13.site, and our Discord is located at: https://discord.gg/kJ7UfvM . Hope to see you soon!</b>"
 /*			if("Thanks")
 				msgplayer = "\blue <b>NOTICE: <font color=red>[usr.key]</font> is autoresponding with <font color='#009900'>'[choice]'</font>! Have a CM day!</b>"
 			if("Guilty")

code/modules/projectiles/projectile/bullets.dm

@@ -130,48 +130,58 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	damage = 25 //9mm, .38, etc
 	armor_penetration = 13.5
+	agony = 20
 
 /obj/item/projectile/bullet/pistol/medium
 	damage = 26.5 //.45
 	armor_penetration = 14.5
+	agony = 22
 
 /obj/item/projectile/bullet/pistol/medium/smg
 	fire_sound = 'sound/weapons/gunshot/gunshot_smg.ogg'
 	damage = 40 //10mm
 	armor_penetration = 20
+	agony = 31
 
 /obj/item/projectile/bullet/pistol/medium/smg/hollowpoint
 	fire_sound = 'sound/weapons/gunshot/gunshot_smg.ogg'
 	damage = 34 //10mm hollowpoint
 	armor_penetration = 12
+	agony = 25
 
 /obj/item/projectile/bullet/pistol/medium/smg/ap
 	fire_sound = 'sound/weapons/gunshot/gunshot_smg.ogg'
 	damage = 26 //10mm AP
 	armor_penetration = 24
+	agony = 21
 
 /obj/item/projectile/bullet/pistol/medium/smg/silver
 	fire_sound = 'sound/weapons/gunshot/gunshot_smg.ogg'
 	damage = 30 //10mm but i have no idea what bimmer wanted for classifaction, so i made it just better normal ammo
 	armor_penetration = 18
+	agony = 23
 
 /obj/item/projectile/bullet/pistol/medium/revolver
 	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 30 //.44 magnum or something
+	agony = 23
 
 /obj/item/projectile/bullet/pistol/strong //matebas
 	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 60 //.50AE
 	armor_penetration = 30
+	agony = 40
 
 /obj/item/projectile/bullet/pistol/vstrong //tacrevolver
 	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 70 //.500 S&W Magnum
 	armor_penetration = 35
+	agony = 45
 
 /obj/item/projectile/bullet/pistol/strong/revolver //revolvers
 	damage = 50 //Revolvers get snowflake bullets, to keep them relevant
 	armor_penetration = 20
+	agony = 36
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
@@ -182,13 +192,15 @@
 	sharp = 0
 	armor_penetration = 2.5
 
+
 /* shotgun projectiles */
 
 /obj/item/projectile/bullet/shotgun
 	name = "slug"
 	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
 	damage = 55
 	armor_penetration = 20
+	agony = 34
 
 /obj/item/projectile/bullet/shotgun/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -207,21 +219,25 @@
 	pellets = 6
 	range_step = 1
 	spread_step = 10
+	agony = 10
 
 /* "Rifle" rounds */
 
 /obj/item/projectile/bullet/rifle
 	armor_penetration = 25
 	penetrating = 1
+	agony = 20
 
 /obj/item/projectile/bullet/rifle/a556
 	fire_sound = 'sound/weapons/gunshot/gunshot3.ogg'
 	damage = 30
+	agony = 23
 
 /obj/item/projectile/bullet/rifle/a762
 	fire_sound = 'sound/weapons/gunshot/gunshot2.ogg'
 	damage = 35
 	armor_penetration = 30
+	agony = 24
 
 /obj/item/projectile/bullet/rifle/a145
 	fire_sound = 'sound/weapons/gunshot/sniper.ogg'
@@ -238,24 +254,28 @@
 	penetrating = 6
 	armor_penetration = 95
 	penetration_modifier = 1.5
+	agony = 25
 
 /* Miscellaneous */
 
 /obj/item/projectile/bullet/suffocationbullet//How does this even work?
 	name = "co bullet"
 	damage = 25
 	damage_type = OXY
+	agony = 20
 
 /obj/item/projectile/bullet/cyanideround
 	name = "poison bullet"
 	damage = 45
 	damage_type = TOX
+	agony = 20
 
 /obj/item/projectile/bullet/burstbullet
 	name = "exploding bullet"
 	damage = 25
 	embed = 0
 	edge = 1
+	agony = 20
 
 /obj/item/projectile/bullet/gyro
 	fire_sound = 'sound/effects/Explosion1.ogg'

html/changelogs/affie.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Affie
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Guns now hurt, a lot! Different guns hurt more than others. Go figure. This normally scales with the default damage, not always."
+  - tweak: "999 is now a bit more effective and less likely to murder people. It's grapple is also a bit stronger since... The last iteration was pitiful."

html/changelogs/lion.yml

@@ -0,0 +1,46 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: TheLion1675
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - experiment: "The Site 19 server banned all SCP13 devs and staff. Be sure to say hi to them! Also, be sure to connect to scp13.site:106!"
+  - rscdel: "Removed an old autoreply. Sad RIP."
+  - rscadd: "Added a new autoreply for forum, wiki and discord information."
+  - imageadd: "New camera sprites, with thanks to UFRLAmmar."
+  - maptweak: "Added a CAUTION! to the SCP-895 camera."
+  - maptweak: "Added catwalks to LCZ hallways."
+  - tweak: "Gives Guards a sane strength and dexterity again. This should prevent one-hit pops of the foot."
+  - tweak: "Added alternative access for Archivist, who can now access all archives. Their console is ID locked, and the Archive is generally overhauled and redesigned. They now also have their own ID Card with their specific access. First job in many to come."
+  - tweak: "Added two new steal objectives for C.I. Operatives."
+  - bugfix: "Fixes some runtimes occurring when double catwalks spawn."
+  - bugfix: "Fixes some area's in HCZ not spawning catwalks."

maps/site53/items/cards_ids.dm

@@ -325,4 +325,13 @@
 	desc = "A light blue card. Seems almost as unimportant as the person itself."
 	icon_state = "securitylvl1"
 	item_state = "Sec_ID1"
-	job_access_type = /datum/job/emt
+	job_access_type = /datum/job/emt
+
+// ARCHIVE
+
+/obj/item/weapon/card/id/archivist
+	name = "level five administration keycard"
+	desc = "A black keycard. Looks like the person wearing this won't give it up easy."
+	icon_state = "adminlvl5"
+	item_state = "Admin_ID"
+	job_access_type = /datum/job/archivist

maps/site53/job/access.dm

@@ -122,4 +122,12 @@
 /datum/access/dclassjanitorial
 	id = access_dclassjanitorial
 	desc = "D-Class Janitorial"
+	region = ACCESS_REGION_GENERAL
+
+// ARCHIVE
+
+/var/const/access_archive = 600
+/datum/access/archive
+	id = access_archive
+	desc = "Archive"
 	region = ACCESS_REGION_GENERAL

maps/site53/job/jobs.dm

@@ -193,7 +193,7 @@
 	)
 	equip(var/mob/living/carbon/human/H)
 		..()
-		H.add_stats(rand(30,45), rand(50,65), rand(15,20)) // Str, Dex, Int.
+		H.add_stats(rand(10), rand(10), rand(15,20)) // Str, Dex, Int.
 		H.add_skills(rand(60,80), rand(60,80), rand(15,30), rand(5,10)) // Melee, Ranged, Medical, Engineering.
 	access = list(access_mtflvl1, access_mtflvl2, access_dclassjanitorial, access_dclassmining, access_dclasskitchen, access_dclassbotany)
 	minimal_access = list()
@@ -247,7 +247,7 @@
 	)
 	equip(var/mob/living/carbon/human/H)
 		..()
-		H.add_stats(rand(30,45), rand(50,65), rand(15,20)) // Str, Dex, Int.
+		H.add_stats(rand(10), rand(10), rand(15,20)) // Str, Dex, Int.
 		H.add_skills(rand(80,100), rand(80,100), rand(15,30), rand(5,10)) // Melee, Ranged, Medical, Engineering.
 
 	access = list(access_mtflvl1, access_mtflvl2, access_mtflvl3, access_mtflvl4, access_sciencelvl1, access_sciencelvl2, access_sciencelvl3, access_sciencelvl4)
@@ -277,7 +277,7 @@
 	)
 	equip(var/mob/living/carbon/human/H)
 		..()
-		H.add_stats(rand(30,45), rand(50,65), rand(15,20)) // Str, Dex, Int.
+		H.add_stats(rand(10), rand(10), rand(15,20)) // Str, Dex, Int.
 		H.add_skills(rand(60,80), rand(60,80), rand(15,30), rand(5,10)) // Melee, Ranged, Medical, Engineering.
 
 	access = list(access_mtflvl1, access_mtflvl2, access_mtflvl3, access_sciencelvl1, access_sciencelvl2, access_sciencelvl3)
@@ -306,7 +306,7 @@
 	)
 	equip(var/mob/living/carbon/human/H)
 		..()
-		H.add_stats(rand(30,45), rand(50,65), rand(15,20)) // Str, Dex, Int.
+		H.add_stats(rand(10), rand(10), rand(15,20)) // Str, Dex, Int.
 		H.add_skills(rand(50,80), rand(50,80), rand(15,30), rand(5,10)) // Melee, Ranged, Medical, Engineering.
 
 	access = list(access_mtflvl1, access_sciencelvl1)
@@ -891,7 +891,7 @@
 		H.add_stats(rand(1,3), rand(0,3), rand(5,10)) // Str, Dex, Int.
 		H.add_skills(rand(5,10), rand(5,10), rand(5,10), rand(5,10)) // Melee, Ranged, Medical, Engineering.
 
-	access = list(access_sciencelvl1, access_sciencelvl2, access_sciencelvl3)
+	access = list(access_archive)
 	minimal_access = list()
 
 /datum/job/o5rep

maps/site53/job/outfits.dm

@@ -210,7 +210,7 @@
 	uniform = /obj/item/clothing/under/suit_jacket/really_black
 	shoes = /obj/item/clothing/shoes/laceup
 	l_pocket = /obj/item/device/radio
-	id_type = /obj/item/weapon/card/id/sciencelvl3
+	id_type = /obj/item/weapon/card/id/archivist
 	back = null
 	l_ear = null