Merge branch 'master' into Nebula-fixes

citadel.dme

@@ -1135,6 +1135,8 @@
 #include "code\game\content\factions\derelict\derelict.dm\derelict_horrors.dm"
 #include "code\game\content\factions\derelict\derelict.dm\derelict_props.dm"
 #include "code\game\content\factions\derelict\derelict.dm\derelict_structures.dm"
+#include "code\game\content\factions\fey_forest\fey_fauna.dm"
+#include "code\game\content\factions\fey_forest\fey_flora.dm"
 #include "code\game\content\factions\orion\iwl\armor.dm"
 #include "code\game\content\factions\orion\iwl\guns.dm"
 #include "code\game\content\factions\orion\iwl\head.dm"
@@ -3394,6 +3396,7 @@
 #include "code\modules\maps\overmap\planets\_virgo3b.dm"
 #include "code\modules\maps\overmap\planets\admin_andromeda.dm"
 #include "code\modules\maps\overmap\planets\admin_croatoan.dm"
+#include "code\modules\maps\overmap\planets\admin_fey_map.dm"
 #include "code\modules\maps\overmap\planets\classd.dm"
 #include "code\modules\maps\overmap\planets\classg.dm"
 #include "code\modules\maps\overmap\planets\classh.dm"
@@ -4714,6 +4717,7 @@
 #include "code\modules\reagents\machinery\reagent_dispenser\water.dm"
 #include "code\modules\reagents\machinery\reagent_dispenser\watercooler.dm"
 #include "code\modules\reagents\reagent_containers\blood_pack.dm"
+#include "code\modules\reagents\reagent_containers\blood_pack_vr.dm"
 #include "code\modules\reagents\reagent_containers\borghydro.dm"
 #include "code\modules\reagents\reagent_containers\cartridge.dm"
 #include "code\modules\reagents\reagent_containers\dropper.dm"

code/__DEFINES/radiation/mobs.dm

@@ -84,6 +84,7 @@
 #define RAD_MOB_AFFLICT_STRENGTH_SLIMETOXIN(removed) (75 * removed)
 #define RAD_MOB_AFFLICT_STRENGTH_MUTAGEN(removed) (100 * removed)
 #define RAD_MOB_AFFLICT_STRENGTH_RADIUM(removed) (100 * removed)
+#define RAD_MOB_AFFLICT_STRENGTH_POL210(removed) (5000 * removed) //Polonium 210
 #define RAD_MOB_AFFLICT_DNA_INJECTOR (rand(150, 300))
 #define RAD_MOB_AFFLICT_FLORARAY_ON_PLANT (rand(30, 80))
 #define RAD_MOB_AFFLICT_VIRUS_RADIAN(multiplier) (multiplier * 15)

code/__DEFINES/tgs.dm

@@ -1,7 +1,7 @@
 // tgstation-server DMAPI
 // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119.
 
-#define TGS_DMAPI_VERSION "7.2.1"
+#define TGS_DMAPI_VERSION "7.3.0"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/game/content/factions/fey_forest/fey_fauna.dm

@@ -0,0 +1,46 @@
+/mob/living/simple_mob/animal/event/fey/crawler
+	name = "crawler"
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_fauna.dmi'
+	desc = "A spider-like creature that moves on an excessive amount of legs. Its flesh constantly crawls and shifts erratically, like its body can't decide on what form it wants."
+	icon_living = "ambusher"
+	icon_state = "ambusher"
+	maxHealth = 150
+	health = 150
+	movement_cooldown = 3
+	legacy_melee_damage_lower = 15
+	legacy_melee_damage_upper = 15
+	base_attack_cooldown = 10
+	attack_sound = 'sound/mobs/biomorphs/drone_attack.ogg'
+	ai_holder_type = /datum/ai_holder/polaris/simple_mob/melee/evasive
+
+/mob/living/simple_mob/animal/event/fey/leaper
+	name = "leaper"
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_fauna.dmi'
+	desc = "You can't quite tell what this is, considering the fact it looks more like a mouth with legs sloppily strapped onto it... Its flesh constantly shifts and wriggles around erratically. Ew."
+	icon_living = "wriggler"
+	icon_state = "wriggler"
+	maxHealth = 150
+	health = 150
+	movement_cooldown = 3
+	legacy_melee_damage_lower = 20
+	legacy_melee_damage_upper = 20
+	base_attack_cooldown = 10
+	attack_sound = 'sound/mobs/biomorphs/drone_attack.ogg'
+	ai_holder_type = /datum/ai_holder/polaris/simple_mob/melee
+
+/mob/living/simple_mob/animal/event/fey/chameleon
+	name = "chameleon"
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_fauna.dmi'
+	desc = "Its skin looks... Translucent, yet its flesh crawls around like it wants to leave its body."
+	icon_living = "chameleon"
+	icon_state = "chameleon"
+	maxHealth = 100
+	health = 100
+	alpha = 150
+	movement_cooldown = 3
+	legacy_melee_damage_lower = 20
+	legacy_melee_damage_upper = 20
+	base_attack_cooldown = 10
+	attack_sound = 'sound/mobs/biomorphs/drone_attack.ogg'
+	projectiletype = /obj/projectile/energy/neurotoxin
+	ai_holder_type = /datum/ai_holder/polaris/simple_mob/ranged/kiting/threatening

code/game/content/factions/fey_forest/fey_flora.dm

@@ -0,0 +1,215 @@
+/datum/prototype/material/alienalloy/denseforest
+	id = "denseforest"
+	name = "denseforest"
+
+	// Becomes "[display_name] wall" in the UI.
+	display_name = "Dense Forest"
+
+	icon_base = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_jungle_walls.dmi'
+	icon_colour = "#37a52d"
+	wall_stripe_icon = null // leave null
+
+/turf/simulated/wall/fey/forest_wall
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_jungle_walls.dmi'
+	material_outer = /datum/prototype/material/alienalloy/denseforest
+	name = "Dense Forest"
+	desc = "Hundreds of thousand years of unkempt forest growth has forged this impenetrable wall of roots, leaves, bark and other materials. Good luck getting through that."
+	description_info = "No way you can get past this..."
+	block_tele = TRUE
+	integrity_enabled = 0
+
+
+/obj/structure/flora/tree/fey/large_tree
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_trees.dmi'
+	pixel_x = -49
+	pixel_y = -19
+	bounds = "16,16"
+	name = "Large Tree"
+	desc = "A large tree that extends into the sky, joining with the gargantuan canopy. Looks too thick to reasonably cut down."
+	integrity_max = 1000
+	integrity = 1000
+
+/obj/structure/flora/tree/fey/large_tree/tree1
+	icon_state = "tree_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree2
+	icon_state = "tree1_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree3
+	icon_state = "tree2_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree4
+	icon_state = "tree3_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree5
+	icon_state = "tree4_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree6
+	icon_state = "tree5_complete"
+
+/obj/structure/flora/tree/fey/large_tree/tree7
+	icon_state = "tree6_complete"
+
+/obj/structure/flora/tree/fey/small_tree
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_trees_small.dmi'
+	pixel_x = -25
+	bounds = "16,16"
+	name = "Small Tree"
+	desc = "A small tree, compared to the others atleast. Despite its height, its trunk is far too thick to cut down."
+	integrity_max = 600
+	integrity = 600
+
+/obj/structure/flora/tree/fey/small_tree/tree1
+	icon_state = "tree1complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree2
+	icon_state = "tree2complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree3
+	icon_state = "tree3complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree4
+	icon_state = "tree4complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree5
+	icon_state = "tree5complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree6
+	icon_state = "tree6complet"
+
+/obj/structure/flora/tree/fey/small_tree/tree7
+	icon_state = "treecomplet"
+
+/turf/simulated/floor/fey/forest_grass
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora.dmi'
+	icon_state = "forest_floor"
+	name = "Forest Floor"
+	desc = "The hardy forest floor, you can see the occasional root sticking out along with a variety of rocks and twigs."
+	footstep_sounds = list("human" = list(
+		'sound/effects/footstep/asteroid1.ogg',
+		'sound/effects/footstep/asteroid2.ogg',
+		'sound/effects/footstep/asteroid3.ogg',
+		'sound/effects/footstep/asteroid4.ogg'))
+
+/turf/simulated/floor/fey/dry_grass
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora.dmi'
+	icon_state = "dry_grass"
+	name = "Dry Grass"
+	desc = "A patch of dried forest grass that's been exposed to the sun far too long."
+	footstep_sounds = list("human" = list(
+		'sound/effects/footstep/asteroid1.ogg',
+		'sound/effects/footstep/asteroid2.ogg',
+		'sound/effects/footstep/asteroid3.ogg',
+		'sound/effects/footstep/asteroid4.ogg'))
+
+
+/obj/structure/flora/rock/fey
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora.dmi'
+	name = "Rock Cluster"
+	desc = "A cluster of hardy rocks."
+	density = 0
+
+/obj/structure/flora/rock/fey/rock1
+	icon_state = "rock1"
+
+/obj/structure/flora/rock/fey/rock2
+	icon_state = "rock2"
+
+/obj/structure/flora/rock/fey/rock3
+	icon_state = "rock3"
+
+/obj/structure/flora/rock/fey/rock4
+	icon_state = "rock4"
+
+/obj/structure/flora/rock/fey/rock5
+	icon_state = "rock5"
+
+/obj/structure/flora/grass/fey/bush
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora.dmi'
+	name = "Bush"
+	desc = "A cluster of bushes and grass."
+	density = 0
+
+/obj/structure/flora/grass/fey/bush/bush1
+	icon_state = "busha1"
+
+/obj/structure/flora/grass/fey/bush/bush2
+	icon_state = "busha2"
+
+/obj/structure/flora/grass/fey/bush/bush3
+	icon_state = "busha3"
+
+/obj/structure/flora/grass/fey/bush/bush4
+	icon_state = "bushb1"
+
+/obj/structure/flora/grass/fey/bush/bush5
+	icon_state = "bushb2"
+
+/obj/structure/flora/grass/fey/bush/bush6
+	icon_state = "bushb3"
+
+/obj/structure/flora/grass/fey/bush/bush7
+	icon_state = "bushc1"
+
+/obj/structure/flora/grass/fey/bush/bush8
+	icon_state = "bushc2"
+
+/obj/structure/flora/grass/fey/bush/bush9
+	icon_state = "bushc3"
+
+/obj/structure/flora/fey/grass
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora.dmi'
+	name = "Grass"
+	desc = "A mixture of grass and twigs."
+	density = 0
+
+/obj/structure/flora/fey/grass/grass1
+	icon_state = "grassa1"
+
+/obj/structure/flora/fey/grass/grass2
+	icon_state = "grassa2"
+
+/obj/structure/flora/fey/grass/grass3
+	icon_state = "grassa3"
+
+/obj/structure/flora/fey/grass/grass4
+	icon_state = "grassa4"
+
+/obj/structure/flora/fey/grass/grass5
+	icon_state = "grassa5"
+
+/obj/structure/flora/fey/grass/grass6
+	icon_state = "grassa"
+
+/obj/structure/flora/fey/grass/grass7
+	icon_state = "grassb1"
+
+/obj/structure/flora/fey/grass/grass8
+	icon_state = "grassb2"
+
+/obj/structure/flora/fey/grass/grass9
+	icon_state = "grassb"
+
+/obj/structure/flora/fey/large
+	icon = 'code/game/content/factions/fey_forest/fey_forest.dmi/fey_flora_64x64.dmi'
+	name = "Large Flora"
+	desc = "Giganticism at its finest. This part of the endless forest has been alive for centuries, if not thousands of years."
+	density = 0
+
+/obj/structure/flora/fey/large/bush1
+	icon_state = "bush1"
+
+/obj/structure/flora/fey/large/bush2
+	icon_state = "bush2"
+
+/obj/structure/flora/fey/large/bush3
+	icon_state = "bush3"
+
+/obj/structure/flora/fey/large/rock1
+	icon_state = "rocks1"
+
+/obj/structure/flora/fey/large/rock2
+	icon_state = "rocks2"
+
+/obj/structure/flora/fey/large/rock3
+	icon_state = "rocks3"

code/game/objects/effects/chem/chemsmoke.dm

@@ -221,3 +221,5 @@
 	targetTurfs = complete
 
 	return
+
+

code/game/objects/items/contraband.dm

@@ -13,6 +13,12 @@
 	//wrapper_color = COLOR_BLUE
 	starts_with = list(/obj/item/reagent_containers/pill/zoom = 7)
 
+/obj/item/storage/pill_bottle/polonium
+	name = "bottle of pills"
+	desc = "An unlabeled bottle of pills. It seems vaguely warm."
+	//wrapper_color = COLOR_BLUE
+	starts_with = list(/obj/item/reagent_containers/pill/polonium = 7)
+
 /obj/item/reagent_containers/glass/beaker/vial/random
 	atom_flags = NONE
 	var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -388,3 +388,53 @@
 	beakers += B1
 	beakers += B2
 	icon_state = initial(icon_state) +"_locked"
+
+
+
+//Nanite Cloud Warcrimes!!!
+
+/obj/item/grenade/chem_grenade/nanite_shredder
+	name = "shredder nanite grenade"
+	desc = "Weaponized nanites are banned by all galactic major powers. On the frontier however there is little authority to stop wannabee \
+	Oppenheimers from making weapons such as this."
+	stage = 2
+	path = 1
+
+/obj/item/grenade/chem_grenade/nanite_shredder/Initialize(mapload)
+	. = ..()
+	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+
+	B1.reagents.add_reagent(/datum/reagent/phosphorus, 30)
+	B1.reagents.add_reagent(/datum/reagent/nanite/shredding, 30)
+	B2.reagents.add_reagent(/datum/reagent/potassium, 30)
+	B2.reagents.add_reagent(/datum/reagent/sugar, 30)
+
+	detonator = new/obj/item/assembly_holder/timer_igniter(src)
+
+	beakers += B1
+	beakers += B2
+	icon_state = initial(icon_state) +"_locked"
+
+/obj/item/grenade/chem_grenade/nanite_neurophage
+	name = "neurophage nanite grenade"
+	desc = "Weaponized nanites are banned by all galactic major powers. On the frontier however there is little authority to stop wannabee \
+	Oppenheimers and other mad scientists from making weapons such as this."
+	stage = 2
+	path = 1
+
+/obj/item/grenade/chem_grenade/nanite_neurophage/Initialize(mapload)
+	. = ..()
+	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+
+	B1.reagents.add_reagent(/datum/reagent/phosphorus, 30)
+	B1.reagents.add_reagent(/datum/reagent/nanite/neurophage, 30)
+	B2.reagents.add_reagent(/datum/reagent/potassium, 30)
+	B2.reagents.add_reagent(/datum/reagent/sugar, 30)
+
+	detonator = new/obj/item/assembly_holder/timer_igniter(src)
+
+	beakers += B1
+	beakers += B2
+	icon_state = initial(icon_state) +"_locked"

code/modules/food/glass/bottle.dm

@@ -186,3 +186,10 @@
 	icon = 'icons/obj/medical/chemical.dmi'
 	icon_state = "bottle-3"
 	prefill = list("biomass" = 60)
+
+/obj/item/reagent_containers/glass/bottle/superhol
+	name = "unlabeled bottle"
+	desc = "A unlabeled bottle that seems to be filled with ethanol. The fumes burn the air around you."
+	icon = 'icons/obj/medical/chemical.dmi'
+	icon_state = "bottle-4"
+	prefill = list(/datum/reagent/superhol = 60)