Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New colossus loot, the "Anomalous Crystal" #20328

Merged
merged 3 commits into from Sep 9, 2016
Merged

New colossus loot, the "Anomalous Crystal" #20328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8605809
New colossus loot, the "Anomolous Crystal"
Ergovisavi Sep 3, 2016
4e4f091
Merge branch 'master' of https://github.com/tgstation/-tg-station int…
Ergovisavi Sep 7, 2016
114676c
Finishing up anomalous crystals
Ergovisavi Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
#define ispodperson(A) (is_species(A, /datum/species/podperson))
#define isflyperson(A) (is_species(A, /datum/species/fly))
#define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
#define isshadowperson(A) (is_species(A, /datum/species/shadow))
#define iszombie(A) (is_species(A, /datum/species/zombie))
#define ishumanbasic(A) (is_species(A, /datum/species/human))

Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/structures/flora.dm
View file
Open in desktop
Expand Up @@ -23,7 +23,9 @@
return
user.visible_message("<span class='notice'>[user] fells [src] with the [W].</span>","<span class='notice'>You fell [src] with the [W].</span>", "You hear the sound of a tree falling.")
playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "tree_stump"
pixel_x = -16
name += " stump"
cut = TRUE
for(var/i=1 to log_amount)
Expand Down Expand Up @@ -56,6 +58,15 @@
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_1"

/obj/structure/flora/tree/palm
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"

/obj/structure/flora/tree/palm/New()
..()
icon_state = pick("palm1","palm2")
pixel_x = 0

/obj/structure/festivus
name = "festivus pole"
icon = 'icons/obj/flora/pinetrees.dmi'
Expand Down
47 changes: 41 additions & 6 deletions code/game/turfs/simulated/floor/fancy_floor.dm
View file
Open in desktop
Expand Up @@ -28,24 +28,59 @@
initial_gas_mix = "TEMP=2.7"

/turf/open/floor/grass
name = "Grass patch"
name = "grass patch"
icon_state = "grass"
floor_tile = /obj/item/stack/tile/grass
broken_states = list("sand")
var/ore_type = /obj/item/weapon/ore/glass

/turf/open/floor/grass/New()
..()
spawn(1)
update_icon()

/turf/open/floor/grass/attackby(obj/item/C, mob/user, params)
if(istype(C, /obj/item/weapon/shovel) && params)
new ore_type(src)
new ore_type(src) //Make some sand if you shovel grass
user << "<span class='notice'>You shovel [src].</span>"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't make much grammatical sense

Copy link
Contributor Author

@Ergovisavi Ergovisavi Sep 8, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This becomes "You shovel the snow" and "You shovel the grass patch" and "You shovel the volcanic floor". This is proper grammar unless I'm wildly mistaken?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that makes more sense, I didn't realise the turfs had names like that, does byond insert the "the" automatically?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's not a proper noun I think it get the "the" treatment

make_plating()
if(..())
return
if(istype(C, /obj/item/weapon/shovel))
new /obj/item/weapon/ore/glass(src)
new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass
user << "<span class='notice'>You shovel the grass.</span>"
make_plating()

/turf/open/floor/grass/snow
name = "snow"
icon = 'icons/turf/snow.dmi'
desc = "Looks cold."
icon_state = "snow"
ore_type = /obj/item/stack/sheet/mineral/snow
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = "o2=22;n2=82;TEMP=180"
slowdown = 2


/turf/open/floor/grass/snow/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))//You need to dig this turf out instead of crowbarring it
return
..()

/turf/open/floor/grass/snow/basalt //By your powers combined, I am captain planet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is inheriting the slowdown from the snow. Presumably you don't want that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it doesnt

name = "volcanic floor"
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
ore_type = /obj/item/weapon/ore/glass/basalt
initial_gas_mix = "o2=14;n2=23;TEMP=300"
slowdown = 0

/turf/open/floor/grass/snow/basalt/New()
..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
switch(icon_state)
if("basalt1", "basalt2", "basalt3")
SetLuminosity(1, 1)


/turf/open/floor/carpet
name = "Carpet"
Expand Down
5 changes: 4 additions & 1 deletion code/modules/mining/mine_turfs.dm
View file
Open in desktop
Expand Up @@ -278,7 +278,7 @@
/turf/open/floor/plating/asteroid/airless/cave/volcanic
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 10, /mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30,
/mob/living/simple_animal/hostile/spawner/lavaland = 2, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
/mob/living/simple_animal/hostile/megafauna/dragon = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 2)
/mob/living/simple_animal/hostile/megafauna/dragon = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 2, /mob/living/simple_animal/hostile/megafauna/colossus = 2)

data_having_type = /turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
Expand Down Expand Up @@ -507,6 +507,9 @@
/turf/open/floor/plating/asteroid/snow/temperatre
initial_gas_mix = "TEMP=255.37"

/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = "o2=22;n2=82;TEMP=180"

/turf/open/floor/plating/asteroid/New()
var/proper_name = name
..()
Expand Down