This commit is contained in:
Neerti
2017-11-26 12:08:05 -05:00
parent 54f4ad7198
commit 7497aef295
36 changed files with 509 additions and 16 deletions
+10
View File
@@ -210,6 +210,16 @@
icon_state = "reactiveoff"
..()
/obj/item/clothing/suit/armor/alien
name = "alien armor"
desc = "It's really resilient yet lightweight, so it's probably meant to be armor. Strangely enough it seems to have been designed for a humanoid shape."
icon_state = "alien"
blood_overlay_type = "armor"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
slowdown = 0
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 65, bullet = 65, laser = 65, energy = 50, bomb = 50, bio = 0, rad = 40)
//Non-hardsuit ERT armor.
/obj/item/clothing/suit/armor/vest/ert
name = "emergency response team armor"
+13
View File
@@ -642,6 +642,19 @@ var/list/name_to_material
display_name = "elevator panelling"
icon_colour = "#666666"
// Ditto.
/material/alienalloy/dungeonium
name = "dungeonium"
display_name = "ultra-durable"
icon_base = "dungeon"
icon_colour = "#FFFFFF"
/material/alienalloy/alium
name = "alium"
display_name = "alien"
icon_base = "alien"
icon_colour = "#FFFFFF"
/material/resin
name = "resin"
icon_colour = "#35343a"
+18
View File
@@ -35,6 +35,24 @@
var/const/signfont = "Times New Roman"
var/const/crayonfont = "Comic Sans MS"
/obj/item/weapon/paper/alien
name = "alien tablet"
desc = "It looks highly advanced"
icon = 'icons/obj/abductor.dmi'
icon_state = "alienpaper"
/obj/item/weapon/paper/alien/update_icon()
if(info)
icon_state = "alienpaper_words"
else
icon_state = "alienpaper"
/obj/item/weapon/paper/alien/burnpaper()
return
/obj/item/weapon/paper/alien/AltClick() // No airplanes for me.
return
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
/obj/item/weapon/paper/New()
+15 -1
View File
@@ -20,6 +20,11 @@
maxcharge = 2400
charge_amount = 20
/obj/item/weapon/cell/device/weapon/empty/initialize()
..()
charge = 0
update_icon()
/obj/item/weapon/cell/device/weapon/recharge
name = "self-charging weapon power cell"
desc = "A small power cell designed to power handheld weaponry. This one recharges itself."
@@ -30,4 +35,13 @@
/obj/item/weapon/cell/device/weapon/recharge/captain
charge_amount = 160 //Recharges a lot more quickly...
charge_delay = 100 //... but it takes a while to get started
charge_delay = 100 //... but it takes a while to get started
/obj/item/weapon/cell/device/weapon/recharge/alien
name = "void cell"
desc = "An alien technology that produces energy seemingly out of nowhere. Its small, cylinderal shape means it might be able to be used with human technology, perhaps?"
icon = 'icons/obj/abductor.dmi'
icon_state = "cell"
charge_amount = 120 // 5%.
charge_delay = 50 // Every five seconds, bit faster than the default.
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
+2 -2
View File
@@ -7,7 +7,7 @@
var/obj/item/weapon/cell/power_supply //What type of power cell this uses
var/charge_cost = 240 //How much energy is needed to fire.
var/cell_type = null
var/cell_type = /obj/item/weapon/cell/device/weapon
var/projectile_type = /obj/item/projectile/beam/practice
var/modifystate
var/charge_meter = 1 //if set, the icon state will be chosen based on the current charge
@@ -41,7 +41,7 @@
if(cell_type)
power_supply = new cell_type(src)
else
power_supply = new /obj/item/weapon/cell/device/weapon(src)
power_supply = null
update_icon()
@@ -52,6 +52,10 @@
self_recharge = 1
use_external_power = 1
/obj/item/weapon/gun/energy/retro/empty
icon_state = "retro"
cell_type = null
/obj/item/weapon/gun/energy/captain
name = "antique laser gun"
icon_state = "caplaser"
+17
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"