cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

Browse Source 
# Conflicts:
#	code/game/atoms_movable.dm
This commit is contained in:
Neerti
2017-11-29 22:43:05 -05:00
parent acb208dd3f 84ecfd61c1
commit af5c633cdb
518 changed files with 22619 additions and 17057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/tables/presets.dm
View File

@@ -90,6 +90,23 @@
material = get_material_by_name("holowood")
..()
/obj/structure/table/alien
name = "alien table"
desc = "Advanced flat surface technology at work!"
icon_state = "alien_preview"
can_reinforce = FALSE
can_plate = FALSE
/obj/structure/table/alien/New()
material = get_material_by_name("alium")
verbs -= /obj/structure/table/verb/do_flip
verbs -= /obj/structure/table/proc/do_put
..()
/obj/structure/table/alien/dismantle(obj/item/weapon/wrench/W, mob/user)
to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
return
//BENCH PRESETS
/obj/structure/table/bench/standard
icon_state = "plain_preview"