Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00
parent 5591afc9ce b2d7ee0e51
commit 24a7aa5a9f
550 changed files with 13328 additions and 156749 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm	(rejected hunks)
-@@ -5,7 +5,7 @@
- 	throw_speed = 3
- 	var/signed = FALSE
- 	var/datum/mind/target
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 
- /obj/item/paper/contract/proc/update_text()
- 	return
@@ -1,23 +0,0 @@
-diff a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm	(rejected hunks)
-@@ -91,18 +91,18 @@
- 	info = "...EMPTY HALLS...USELESS SPACE..."
- 
- 
-///////////	Centcom
-+///////////	CentCom
- 
- /obj/item/paper/fluff/stations/centcom/disk_memo
- 	name = "memo"
- 	info = "GET DAT FUKKEN DISK"
- 
- /obj/item/paper/fluff/stations/centcom/broken_evac
-	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
-+	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>CentCom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
- 
- /obj/item/paper/fluff/stations/centcom/bulletin
- 	name = "paper- 'Official Bulletin'"
-	info = "<BR>Centcom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>Centcom Port Commissioner"
-+	info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
- 
- 
- ///////////	Lavaland
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm	(rejected hunks)
-@@ -168,7 +168,7 @@
-  */
- /obj/item/pen/sleepy
- 	origin_tech = "engineering=4;syndicate=2"
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 
- 
- /obj/item/pen/sleepy/attack(mob/living/M, mob/user)
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm	(rejected hunks)
-@@ -497,7 +497,7 @@
- 	desc = "The perfect showcase for your favorite deathtrap memories."
- 	icon = 'icons/obj/decals.dmi'
- 	materials = list()
-	flags = 0
-+	flags_1 = 0
- 	icon_state = "frame-empty"
- 	result_path = /obj/structure/sign/picture_frame
- 	var/obj/item/photo/displayed