Merge pull request #11029 from H0lySquirr3l/master

SmoleWorld micro update
This commit is contained in:
Aronai Sieyes
2021-07-12 02:00:13 -04:00
committed by Chompstation Bot
parent 58f6f5a71a
commit d36eb2c343
2 changed files with 65 additions and 7 deletions

View File

@@ -107,6 +107,7 @@
//defineing actions //defineing actions
/obj/structure/smoletrack /obj/structure/smoletrack
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
color = "#ffffff"
density = 0 density = 0
/obj/structure/smoletrack/attack_hand(mob/user) /obj/structure/smoletrack/attack_hand(mob/user)
@@ -120,6 +121,7 @@
new /obj/item/stack/material/smolebricks(F) new /obj/item/stack/material/smolebricks(F)
qdel(src) qdel(src)
//rotates piece
/obj/structure/smoletrack/verb/rotate_clockwise() /obj/structure/smoletrack/verb/rotate_clockwise()
set name = "Rotate Road Clockwise" set name = "Rotate Road Clockwise"
set category = "Object" set category = "Object"
@@ -128,6 +130,33 @@
return return
src.set_dir(turn(src.dir, 270)) src.set_dir(turn(src.dir, 270))
//color roads
/obj/structure/smoletrack/verb/colorpieces()
set name = "Use Color Pieces"
set category = "Object"
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
return
var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
color = new_color
return
// probably redundant, allows for direct way to dismantal without knowing intents
/obj/structure/smoletrack/verb/menudismantal()
set name = "Take Road Apart"
set category = "Object"
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
return
playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER)
var/turf/simulated/floor/F = get_turf(src)
if(istype(F))
new /obj/item/stack/material/smolebricks(F)
qdel(src)
return
// Road pieces // Road pieces
/obj/structure/smoletrack/roadS /obj/structure/smoletrack/roadS
@@ -164,6 +193,7 @@
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
density = 1 density = 1
anchored = 1 anchored = 1
color = "#ffffff"
var/health = 75 var/health = 75
var/damage var/damage
//makes it so buildings can be dismaintaled or GodZilla style attacked //makes it so buildings can be dismaintaled or GodZilla style attacked
@@ -258,6 +288,31 @@
qdel(src) qdel(src)
return return
//color buildings
/obj/structure/smolebuilding/verb/colorpieces()
set name = "Use Color Pieces"
set category = "Object"
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
return
var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
color = new_color
return
//probably a bit redundant but gives a more direct way to disassemble buildings without using intents
/obj/structure/smolebuilding/verb/menudismantal()
set name = "Take Building Apart"
set category = "Object"
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
return
playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER)
if(!isnull(loc))
new /obj/item/stack/material/smolebricks(loc)
new /obj/item/stack/material/smolebricks(loc)
qdel(src)
return
//buildings //buildings
/obj/structure/smoleruins /obj/structure/smoleruins
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
@@ -268,21 +323,25 @@
name = "smole houses" name = "smole houses"
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolehouses" icon_state = "smolehouses"
color = "#ffffff"
/obj/structure/smolebuilding/business /obj/structure/smolebuilding/business
name = "smole business" name = "smole business"
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolebusiness" icon_state = "smolebusiness"
color = "#ffffff"
/obj/structure/smolebuilding/warehouses /obj/structure/smolebuilding/warehouses
name = "smole warehouses" name = "smole warehouses"
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolewarehouses" icon_state = "smolewarehouses"
color = "#ffffff"
/obj/structure/smolebuilding/museum /obj/structure/smolebuilding/museum
name = "smole museum" name = "smole museum"
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolemuseum" icon_state = "smolemuseum"
color = "#ffffff"
// //
//CAR STUFF < WILL BE MESSED WITH IN A LATER UPDATE COMMENTED OUT FOR NOW //CAR STUFF < WILL BE MESSED WITH IN A LATER UPDATE COMMENTED OUT FOR NOW
///obj/item/smolecar ///obj/item/smolecar
@@ -312,11 +371,11 @@
// //
// //
//snack planets, currently just plopped out will be organized later. //snack planets, currently just plopped out will be organized later.
/obj/item/trash/Asteroidsmall /obj/item/trash/candychunk
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_asteriodB" icon_state = "sp_sugarchunk"
name = "asteriod" name = "chunk of candy"
desc = "A solid chunk of candy crumb that looks like a asteriod." desc = "A solid chunk of candy crumbs, looks like it could be messy."
/obj/item/trash/Asteroidlarge /obj/item/trash/Asteroidlarge
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
@@ -351,7 +410,6 @@
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_moon" icon_state = "sp_moon"
bitesize = 1 bitesize = 1
trash = /obj/item/trash/Asteroidsmall
nutriment_amt = 2 nutriment_amt = 2
nutriment_desc = list("sugar" = 2) nutriment_desc = list("sugar" = 2)
drop_sound = 'sound/items/drop/basketball.ogg' drop_sound = 'sound/items/drop/basketball.ogg'
@@ -373,7 +431,7 @@
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_phoron" icon_state = "sp_phoron"
bitesize = 3 bitesize = 3
trash = /obj/item/trash/Asteroidmulti trash = /obj/item/trash/candychunk
nutriment_amt = 2 nutriment_amt = 2
nutriment_desc = list("spicy" = 2) nutriment_desc = list("spicy" = 2)
drop_sound = 'sound/items/drop/basketball.ogg' drop_sound = 'sound/items/drop/basketball.ogg'
@@ -384,7 +442,7 @@
icon = 'icons/vore/smoleworld_vr.dmi' icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_virgoprime" icon_state = "sp_virgoprime"
bitesize = 3 bitesize = 3
trash = /obj/item/trash/Asteroidmulti trash = /obj/item/trash/candychunk
nutriment_amt = 2 nutriment_amt = 2
nutriment_desc = list("salty" = 2) nutriment_desc = list("salty" = 2)
drop_sound = 'sound/items/drop/basketball.ogg' drop_sound = 'sound/items/drop/basketball.ogg'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 54 KiB