Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584

[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
parent 3f3f86e81a 10909c9dee
commit e680da7de6
27 changed files with 19807 additions and 1 deletions
@@ -32,6 +32,11 @@
 	can_flashlight = 1
 	dog_fashion = null

+/obj/item/clothing/head/helmet/old
+	name = "degrading helmet"
+	desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."
+	tint = 2
+
 /obj/item/clothing/head/helmet/blueshirt
 	icon_state = "blueshift"
 	item_state = "blueshift"
@@ -543,6 +543,34 @@
 	else
 		return FALSE

+	//Old Prototype
+/obj/item/clothing/head/helmet/space/hardsuit/ancient
+	name = "prototype RIG hardsuit helmet"
+	desc = "Early prototype RIG hardsuit helmet, designed to quickly shift over a user's head. Design constraints of the helmet mean it has no inbuilt cameras, thus it restricts the users visability."
+	icon_state = "hardsuit0-ancient"
+	item_state = "anc_helm"
+	armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
+	tint = 2
+	item_color = "ancient"
+	resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/suit/space/hardsuit/ancient
+	name = "prototype RIG hardsuit"
+	desc = "Prototype powered RIG hardsuit. Provides excellent protection from the elements of space while being comfortable to move around in, thanks to the powered locomotives. Remains very bulky however."
+	icon_state = "hardsuit-ancient"
+	item_state = "anc_hardsuit"
+	armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
+	slowdown = 3
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient
+	resistance_flags = FIRE_PROOF
+	var/footstep = 1
+
+obj/item/clothing/suit/space/hardsuit/ancient/on_mob_move()
+	if(footstep > 1)
+		playsound(src, "suitstep", 50, 1)
+		footstep = 0
+	else
+		footstep++

 /////////////SHIELDED//////////////////////////////////

@@ -94,6 +94,19 @@ Contains:
 	desc = "An old, NASA Centcom branch designed, dark red space suit."
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/device/multitool)

+/obj/item/clothing/head/helmet/space/nasavoid/old
+	name = "Engineering Void Helmet"
+	desc = "A Centcom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
+	icon_state = "void"
+	item_state = "void"
+
+/obj/item/clothing/suit/space/nasavoid/old
+	name = "Engineering Voidsuit"
+	icon_state = "void"
+	item_state = "void"
+	desc = "A Centcom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
+	slowdown = TRUE
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/device/multitool)

 	//Space santa outfit suit
 /obj/item/clothing/head/helmet/space/santahat
@@ -51,7 +51,6 @@
 	icon_state = "syndicate-orange"
 	item_state = "syndicate-orange"

-
 //Blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/blue
 	name = "blue space helmet"
@@ -25,6 +25,13 @@
 	icon_state = "armor"
 	item_state = "armor"

+/obj/item/clothing/suit/armor/vest/old
+	name = "degrading armor vest"
+	desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."
+	icon_state = "armor"
+	item_state = "armor"
+	slowdown = 1
+
 /obj/item/clothing/suit/armor/vest/blueshirt
 	icon_state = "blueshift"
 	item_state = "blueshift"
@@ -35,11 +35,17 @@
 /mob/living/simple_animal/hostile/hivebot/range
 	name = "hivebot"
 	desc = "A smallish robot, this one is armed!"
+	icon_state = "ranged"
+	icon_living = "ranged"
+	icon_dead = "ranged"
 	ranged = 1
 	retreat_distance = 5
 	minimum_distance = 5

 /mob/living/simple_animal/hostile/hivebot/rapid
+	icon_state = "ranged"
+	icon_living = "ranged"
+	icon_dead = "ranged"
 	ranged = 1
 	rapid = 1
 	retreat_distance = 5
@@ -47,6 +53,9 @@

 /mob/living/simple_animal/hostile/hivebot/strong
 	name = "strong hivebot"
+	icon_state = "strong"
+	icon_living = "strong"
+	icon_dead = "strong"
 	desc = "A robot, this one is armed and looks tough!"
 	health = 80
 	maxHealth = 80
@@ -437,3 +437,51 @@

 /obj/item/weapon/paper/crumpled/bloody
 	icon_state = "scrap_bloodied"
+
+/obj/item/weapon/paper/oldstat
+	name = "Cyro Awakening Alert"
+	info = "<B>**WARNING**</B><BR><BR>Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.<BR><BR>Immediate Objectives<br><br>1: Activate emergency power generator<br>2: Lift station lockdown on the bridge<br><br>Please locate the 'Damage Report' on the bridge for a detailed situation report."
+
+/obj/item/weapon/paper/oldstat/damagereport
+	name = "Damage Report"
+	info = "<b>*Damage Report*</b><br><br><b>Alpha Station</b> - Destroyed<br><br><b>Beta Station</b> - Catastrophic Damage. Medical, destroyed. Atmospherics, partially destroyed. Engine Core, destroyed.<br><br><b>Charlie Station</b> - Intact. Loss of oxygen to eastern side of main corridor.<br><br><b>Delta Station</b> - Intact. <b>WARNING</b>: Unknown force occupying Delta Station. Intent unknown. Species unknown. Numbers unknown.<br><br>Recommendation - Reestablish station powernet via solar array. Reestablish station atmospherics system to restore air."
+
+/obj/item/weapon/paper/oldstat/protosuit
+	name = "B01-RIG Hardsuit Report"
+	info = "<b>*Prototype Hardsuit*</b><br><br>The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united earth government powered military \
+	 exosuit, the RIG Hardsuit is a breakthrough in Hardsuit technology, and is the first post-void war era Hardsuit that can be safely used by a operator.<br><br>The B01 however suffers \
+	  a myriad of constraints. It is slow and bulky to move around, it lacks any significant armor plating against direct attacks and its internal heads up display is unfinished,  \
+	  resulting in the user being unable to see long distances.<br><br>The B01 is unlikely to see any form of mass production, but will serve as a base for future Hardsuit developments."
+
+/obj/item/weapon/paper/oldstat/protohealth
+	name = "Health Analyser Report"
+	info = "<b>*Health Analyser*</b><br><br>The portable Health Analyser is essentially a handheld varient of a health analyser. Years of research have concluded with this device which is \
+	capable of diagnosing even the most critical, obscure or technical injuries any humanoid entity is suffering in a easy to understand format that even a non-trained health professional \
+	 can understand.<br><br>The health analyser is expected to go into full production as standard issue medical kit."
+
+/obj/item/weapon/paper/oldstat/protogun
+	name = "K14 Energy Gun Report"
+	info = "<b>*K14-Multiphase Energy Gun*</b><br><br>The K14 Prototype Energy Gun is the first Energy Rifle that has been successfully been able to not only hold a larger ammo charge \
+	than other gun models, but is capable of swapping between different energy projectile types on command with no incidents.<br><br>The weapon still suffers several drawbacks, its alternative, \
+	non laser fire mode, can only fire one round before exhausting the energy cell, the weapon also remains prohibitively expensive, nonetheless NT Market Research fully believe this weapon \
+	will form the backbone of our Energy weapon cataloge.<br><br>The K14 is expected to undergo revision to fix the ammo issues, the K15 is expected to replace the 'stun' setting with a \
+	'disable' setting in a attempt to bypass the ammo issues."
+
+/obj/item/weapon/paper/oldstat/protosing
+	name = "Singularity Generator"
+	info = "<b>*Singularity Generator*</b><br><br>Modern power generation typically comes in two forms, a Fusion Generator or a Fission Generator. Fusion provides the best space to power \
+	ratio, and is typically seen on military or high security ships and stations, however Fission reactors require the usage of expensive, and rare, materials in its construction.. Fission generators are massive and bulky, and require a large reserve of uranium to power, however they are extremely cheap to operate and oft need little maintenance once \
+	operational.<br><br>The Singularity aims to alter this, a functional Singularity is essentially a controlled Black Hole, a Black Hole that generates far more power than Fusion or Fission \
+	generators can ever hope to produce. "
+
+/obj/item/weapon/paper/oldstat/protoinv
+	name = "Laboratory Inventory"
+	info = "<b>*Inventory*</b><br><br>(1) Prototype Hardsuit<br><br>(1)Health Analyser<br><br>(1)Prototype Energy Gun<br><br>(1)Singularity Generation Disk<br><br><b>DO NOT REMOVE WITHOUT \
+	THE CAPTAIN AND RESEARCH DIRECTOR'S AUTHORISATION<b/>"
+
+/obj/item/weapon/paper/oldstat/report
+	name = "Crew Reawakening Report"
+	info = "Artifical Program's report to surviving crewmembers.<br><br>Crew were placed into cryostasis on March 10th, 2445.<br><br>Crew were awoken from cryostasis around June, 2557.<br><br> \
+	<b>SIGNIFICANT EVENTS OF NOTE</b><br>1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radioation detectors showed no residual \
+	radioation on station. Deduction, primariy detector was malfunctioning and was producing a radioation signal when there was none.<br><br>2: A data burst from a nearby Nanotrasen Space \
+	Station was recieved, this data burst contained research data that has been uploaded to our RnD labs.<br><br>3: Unknown invasion force has occupied Delta station."
@@ -30,6 +30,11 @@
 	e_cost = 83
 	select_name = "kill"

+/obj/item/ammo_casing/energy/lasergun/old
+	projectile_type = /obj/item/projectile/beam/laser
+	e_cost = 200
+	select_name = "kill"
+
 /obj/item/ammo_casing/energy/laser/hos
 	e_cost = 100

@@ -88,6 +93,9 @@
 /obj/item/ammo_casing/energy/electrode/hos
 	e_cost = 200

+/obj/item/ammo_casing/energy/electrode/old
+	e_cost = 1000
+
 /obj/item/ammo_casing/energy/ion
 	projectile_type = /obj/item/projectile/ion
 	select_name = "ion"
@@ -39,6 +39,14 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode/spec, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)


+/obj/item/weapon/gun/energy/e_gun/old
+	name = "prototype energy gun"
+	desc = "NT-P:01 Prototype Energy Gun. Early stage development of a unique laser rifle that has multifaceted energy lens allowing the gun to alter the form of projectile it fires on command."
+	icon_state = "protolaser"
+	ammo_x_offset = 2
+	ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/electrode/old)
+
+
 /obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
 	name = "practice phaser"
 	desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."
@@ -0,0 +1,10 @@
+diff a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm	(rejected hunks)
+@@ -48,7 +48,7 @@
+ /obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
+ 	name = "practice phaser"
+ 	desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."
+-	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/electrode/old)
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/practice)
+ 	icon_state = "decloner"
+ 
+ /obj/item/weapon/gun/energy/e_gun/hos
@@ -24,6 +24,13 @@
 	desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
 	ammo_x_offset = 3

+/obj/item/weapon/gun/energy/laser/retro/old
+	name ="laser gun"
+	icon_state = "retro"
+	desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cyro."
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old)
+	ammo_x_offset = 3
+
 /obj/item/weapon/gun/energy/laser/captain
 	name = "antique laser gun"
 	icon_state = "caplaser"
@@ -312,6 +312,102 @@
 /obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()

+/obj/item/weapon/reagent_containers/glass/beaker/large/hydrogen
+	name = "hydrogen"
+	list_reagents = list("hydrogen" = 50)

+/obj/item/weapon/reagent_containers/glass/beaker/large/lithium
+	name = "lithium"
+	list_reagents = list("lithium" = 50)

+/obj/item/weapon/reagent_containers/glass/beaker/large/carbon
+	name = "carbon"
+	list_reagents = list("carbon" = 50)

+/obj/item/weapon/reagent_containers/glass/beaker/large/nitrogen
+	name = "nitrogen"
+	list_reagents = list("nitrogen" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/oxygen
+	name = "oxygen"
+	list_reagents = list("oxygen" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/fluorine
+	name = "fluorine"
+	list_reagents = list("fluorine" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/sodium
+	name = "sodium"
+	list_reagents = list("sodium" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/aluminium
+	name = "aluminium"
+	list_reagents = list("aluminium" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/silicon
+	name = "silicon"
+	list_reagents = list("silicon" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/phosphorus
+	name = "phosphorus"
+	list_reagents = list("phosphorus" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/sulfur
+	name = "sulfur"
+	list_reagents = list("sulfur" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/chlorine
+	name = "chlorine"
+	list_reagents = list("chlorine" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/potassium
+	name = "potassium"
+	list_reagents = list("potassium" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/iron
+	name = "iron"
+	list_reagents = list("iron" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/copper
+	name = "copper"
+	list_reagents = list("copper" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/mercury
+	name = "mercury"
+	list_reagents = list("mercury" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/radium
+	name = "radium"
+	list_reagents = list("radium" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/water
+	name = "water"
+	list_reagents = list("water" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/ethanol
+	name = "ethanol"
+	list_reagents = list("ethanol" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/sugar
+	name = "sugar"
+	list_reagents = list("sugar" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/sacid
+	name = "sacid"
+	list_reagents = list("sacid" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/welding_fuel
+	name = "welding_fuel"
+	list_reagents = list("welding_fuel" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/silver
+	name = "silver"
+	list_reagents = list("silver" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/iodine
+	name = "iodine"
+	list_reagents = list("iodine" = 50)
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/bromine
+	name = "bromine"
+	list_reagents = list("bromine" = 50)