12/21 modernizations from TG live (#103)

* sync (#3) * shuttle auto call * Merge /vore into /master (#39) * progress * Compile errors fixed No idea if it's test worthy tho as conflicts with race overhaul and narky removal. * Update admins.txt * efforts continue Fuck grab code, seriously * grab code is cancer * Execute the Narkism Do not hesitate. Show no mercy. * holy shit grab code is awful * have I bitched about grab code My bitching, let me show you it * código de agarre es una mierda No really it is * yeah I don't even know anymore. * Lolnope. Fuck grab code * I'm not even sure what to fix anymore * Self eating is not an acceptable fate * Taste the void, son. * My code doesn't pass it's own sanity check. Maybe it's a sign of things to come. * uncommented and notes * It Works and I Don't Know Why (#38) * shuttle auto call * it works and I don't know why * Subsystem 12/21 Most Recent TG subsystem folder * globalvars 12/21 Tossed out the flavor_misc and parallax files * Onclick 12/21 as well as .dme updates * _defines 12/21 ommited old _MC.dm * _HELPERS 12/21 Preserved snowflake placement of furry sprites * _defeines/genetics reapplied narkism holdover for snowflake races. * Oops forgot mutant colors * modules porting 12/21 + Sounds/icons Admin, Client and most of mob life files ommitted * enviroment file * Admin optimizations ahelp log system kept * Mob ports 12/21 Flavor text preserved * datums ported 12/21 * Game ported 12/21 * batch of duplicate fixes/dogborg work Dogborgs need to be modernized to refractored borg standards. * moar fixes * Maps and futher compile fixes
2016-12-22 03:57:55 -06:00
parent f5e143a452
commit cf59ac1c3d
2215 changed files with 707445 additions and 87041 deletions
@@ -6,6 +6,7 @@
 	close_sound = 'sound/effects/bin_close.ogg'
 	anchored = TRUE
 	horizontal = FALSE
+	delivery_icon = null

 /obj/structure/closet/crate/bin/New()
 	..()
@@ -32,7 +33,7 @@
 		do_animate()
 	else if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+		playsound(src.loc, W.usesound, 75, 1)
 	else
 		return ..()

@@ -6,6 +6,8 @@
 	allow_objects = FALSE
 	breakout_time = 1
 	material_drop = /obj/item/stack/sheet/mineral/wood
+	material_drop_amount = 4
+	delivery_icon = "deliverybox"
 	var/obj/item/weapon/tank/internals/emergency_oxygen/tank

 /obj/structure/closet/crate/critter/New()
@@ -14,11 +16,9 @@

 /obj/structure/closet/crate/critter/Destroy()
 	var/turf/T = get_turf(src)
-	tank.loc = T
-	tank = null
-
-	for(var/i in 1 to rand(2, 5))
-		new material_drop(T)
+	if(tank)
+		tank.forceMove(T)
+		tank = null

 	return ..()

@@ -4,6 +4,7 @@
 	icon_state = "largecrate"
 	density = 1
 	material_drop = /obj/item/stack/sheet/mineral/wood
+	delivery_icon = "deliverybox"

 /obj/structure/closet/crate/large/attack_hand(mob/user)
 	add_fingerprint(user)
@@ -4,7 +4,15 @@
 	icon_state = "securecrate"
 	secure = 1
 	locked = 1
-	health = 1000
+	obj_integrity = 500
+	max_integrity = 500
+	armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
+	var/tamperproof = 0
+
+/obj/structure/closet/crate/secure/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
+	if(damage_flag == "melee" && damage_amount < 25)
+		return 0
+	. = ..()

 /obj/structure/closet/crate/secure/update_icon()
 	..()
@@ -15,6 +23,20 @@
 	else
 		add_overlay("securecrateg")

+/obj/structure/closet/crate/secure/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+	if(prob(tamperproof))
+		boom()
+	..()
+
+
+/obj/structure/closet/crate/secure/proc/boom(mob/user)
+	if(user)
+		user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
+	for(var/atom/movable/AM in src)
+		qdel(AM)
+	explosion(get_turf(src), 0, 1, 5, 5)
+	qdel(src)
+
 /obj/structure/closet/crate/secure/weapon
 	desc = "A secure weapons crate."
 	name = "weapons crate"