Merge pull request #13318 from MMMiracles/snowiscold

New Away Mission: Snow Valley+snow atmos
This commit is contained in:
tkdrg
2015-12-16 21:01:07 -03:00
29 changed files with 1531 additions and 23 deletions
@@ -3,6 +3,7 @@ Mineral Sheets
Contains:
- Sandstone
- Diamond
- Snow
- Uranium
- Plasma
- Gold
@@ -237,6 +238,32 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \
pixel_y = rand(0,4)-4
..()
/*
* Snow
*/
/obj/item/stack/sheet/mineral/snow
name = "snow"
icon_state = "sheet-snow"
singular_name = "snow block"
force = 1
throwforce = 2
w_class = 3
throw_speed = 1
throw_range = 3
origin_tech = "materials=1"
sheettype = "snow"
var/global/list/datum/stack_recipe/snow_recipes = list ( \
new/datum/stack_recipe("Snow Wall",/turf/simulated/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
)
/obj/item/stack/sheet/mineral/snow/New(var/loc, var/amount=null)
recipes = snow_recipes
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
..()
/****************************** Others ****************************/
+22 -1
View File
@@ -1,5 +1,5 @@
/* Toys!
* ContainsL
* Contains
* Balloons
* Fake singularity
* Toy gun
@@ -18,6 +18,7 @@
* Beach ball
* Toy xeno
* Kitty toys!
* Snowballs
*/
@@ -1168,6 +1169,26 @@
else
user << "<span class='alert'>Nothing happens.</span>"
/*
* Snowballs
*/
/obj/item/toy/snowball
name = "snowball"
desc = "A compact ball of snow. Good for throwing at people."
icon = 'icons/obj/toy.dmi'
icon_state = "snowball"
throwforce = 12 //pelt your enemies to death with lumps of snow
/obj/item/toy/snowball/afterattack(atom/target as mob|obj|turf|area, mob/user)
user.drop_item()
src.throw_at(target, throw_range, throw_speed)
/obj/item/toy/snowball/throw_impact(atom/hit_atom)
if(!..())
playsound(src, 'sound/effects/pop.ogg', 20, 1)
qdel(src)
/*
* Beach ball
*/
+46 -1
View File
@@ -293,6 +293,8 @@
buckled_mob.pixel_x = -12
buckled_mob.pixel_y = 7
//keys+attachables//
/obj/item/key
name = "key"
desc = "A small grey key."
@@ -314,6 +316,8 @@
icon = 'icons/obj/vehicles.dmi'
icon_state = "upgrade"
//secway//
/obj/structure/bed/chair/janicart/secway
name = "secway"
desc = "A brave security cyborg gave its life to help you look like a complete tool."
@@ -325,4 +329,45 @@
/obj/structure/bed/chair/janicart/secway/update_mob()
if(buckled_mob)
buckled_mob.dir = dir
buckled_mob.pixel_y = 4
buckled_mob.pixel_y = 4
//atv//
/obj/structure/bed/chair/janicart/atv
name = "atv"
desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
icon = 'icons/obj/vehicles.dmi'
icon_state = "atv"
callme = "All-terrain vehicle"
keytype = /obj/item/key
var/image/atvcover = null
/obj/structure/bed/chair/janicart/atv/New()
atvcover = image("icons/obj/vehicles.dmi", "atvcover")
atvcover.layer = MOB_LAYER + 0.1
return ..()
obj/structure/bed/chair/janicart/atv/post_buckle_mob(mob/living/M)
if(buckled_mob)
overlays += atvcover
else
overlays -= atvcover
/obj/structure/bed/chair/janicart/atv/update_mob()
if(buckled_mob)
buckled_mob.dir = dir
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 4
/obj/structure/bed/chair/janicart/atv/handle_rotation()
if(dir == SOUTH)
layer = FLY_LAYER
else
layer = OBJ_LAYER
if(buckled_mob)
if(buckled_mob.loc != loc)
buckled_mob.buckled = null //Temporary, so Move() succeeds.
buckled_mob.buckled = src //Restoring
update_mob()
+11
View File
@@ -350,3 +350,14 @@
name = "Statue of an assistant"
desc = "A cheap statue of sandstone for a greyshirt."
icon_state = "assist"
/////////////////////snow/////////////////////////////////////////
/obj/structure/statue/snow
hardness = 0.5
mineralType = "snow"
/obj/structure/statue/snow/snowman
name = "snowman"
desc = "Several lumps of snow put together to form a snowman."
icon_state = "snowman"
+7 -1
View File
@@ -481,7 +481,13 @@
dir = 5
fulltile = 1
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile/)
/obj/structure/window/reinforced/fulltile/ice
icon = 'icons/obj/smooth_structures/rice_window.dmi'
icon_state = "ice_window"
maxhealth = 150
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/reinforced/fulltile/ice)
/obj/structure/window/shuttle
name = "shuttle window"