module things, jfc

2018-09-11 07:51:01 -05:00
parent 8b9ef1e400
commit 284e9d0325
695 changed files with 11343 additions and 5661 deletions
@@ -0,0 +1,9 @@
+//lavaland_surface_pizzaparty.dmm
+
+/obj/effect/spawner/lootdrop/pizzaparty
+	name = "pizza bomb spawner"
+	loot = list(/obj/item/pizzabox/margherita = 3,
+				/obj/item/pizzabox/meat = 3,
+				/obj/item/pizzabox/mushroom = 3,
+				/obj/item/pizzabox/bomb = 1)
+	lootdoubles = FALSE
@@ -154,6 +154,8 @@
 	var/tile_count = width * height

 	//Generate per tile icons
+	var/icon/base_icon = get_base_icon()
+
 	for(var/id in 1 to tile_count)
 		var/y = width - round((id - 1) / width)
 		var/x = ((id - 1) % width) + 1
@@ -163,7 +165,7 @@
 		var/y_start = 1 + ((y - 1) * world.icon_size)
 		var/y_end = y_start + world.icon_size - 1

-		var/icon/T = get_base_icon()
+		var/icon/T = new(base_icon)
 		T.Crop(x_start,y_start,x_end,y_end)
 		puzzle_pieces["[id]"] = T
 		left_ids += id
@@ -290,10 +292,10 @@
 	prisoner.notransform = FALSE
 	prisoner = null

-//Some armor so it's harder to kill someone by mistake. EDITED - Hugboxed
+//Some armor so it's harder to kill someone by mistake.
 /obj/structure/puzzle_element/prison
-	resistance_flags = INDESTRUCTIBLE | ACID_PROOF | FIRE_PROOF | LAVA_PROOF
-	
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 50, "acid" = 50)
+
 /obj/structure/puzzle_element/prison/relaymove(mob/user)
 	return

@@ -348,4 +350,4 @@
 	//Move them into random block
 	var/obj/structure/puzzle_element/E = pick(cube.elements)
 	prisoner.forceMove(E)
-	return TRUE
+	return TRUE
@@ -0,0 +1,22 @@
+//lavaland_surface_syndicate_base1.dmm
+
+/obj/machinery/vending/syndichem
+	name = "\improper SyndiChem"
+	desc = "A vending machine full of grenades and grenade accessories. Sponsored by DonkCo(tm)."
+	req_access = list(ACCESS_SYNDICATE)
+	products = list(/obj/item/stack/cable_coil/random = 5,
+					/obj/item/assembly/igniter = 20,
+					/obj/item/assembly/prox_sensor = 5,
+					/obj/item/assembly/signaler = 5,
+					/obj/item/assembly/timer = 5,
+					/obj/item/assembly/voice = 5,
+					/obj/item/assembly/health = 5,
+					/obj/item/assembly/infra = 5,
+					/obj/item/grenade/chem_grenade = 5,
+	                /obj/item/grenade/chem_grenade/large = 5,
+	                /obj/item/grenade/chem_grenade/pyro = 5,
+	                /obj/item/grenade/chem_grenade/cryo = 5,
+	                /obj/item/grenade/chem_grenade/adv_release = 5,
+					/obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
+	product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
+	resistance_flags = FIRE_PROOF
@@ -129,7 +129,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'

 /obj/item/kitchen/knife/envy/afterattack(atom/movable/AM, mob/living/carbon/human/user, proximity)
-	..()
+	. = ..()
 	if(!proximity)
 		return
 	if(!istype(user))
@@ -0,0 +1,4 @@
+///////////	miracle ruin
+
+/obj/item/storage/backpack/satchel/flat/secret/miracle_ruin
+	reward_all_of_these = list(/obj/item/gun/energy/pulse/prize)
@@ -47,3 +47,7 @@
 	<b>SIGNIFICANT EVENTS OF NOTE</b><br>1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radiation detectors showed no residual \
 	radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.<br><br>2: A data burst from a nearby Nanotrasen Space \
 	Station was received, this data burst contained research data that has been uploaded to our RnD labs.<br><br>3: Unknown invasion force has occupied Delta station."
+
+/obj/item/paper/fluff/ruins/oldstation/generator_manual
+	name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator manual"
+	info = "You can barely make out a faded sentence... <br><br> Wrench down the generator on top of a wire node connected to either a SMES input terminal or the power grid."