* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
This commit is contained in:
Mervill
2016-11-08 13:55:30 +13:00
committed by oranges
parent 651f9c6d57
commit 9ea955b85f
16 changed files with 5 additions and 28 deletions
-3
View File
@@ -86,8 +86,6 @@
/obj/singularity/wizard
name = "tear in the fabric of reality"
desc = "This isn't right."
icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
icon = 'icons/effects/224x224.dmi'
icon_state = "reality"
pixel_x = -96
@@ -569,4 +567,3 @@ var/global/list/multiverse = list()
heal_brute = 25
heal_burn = 25
heal_oxy = 25
@@ -127,7 +127,6 @@
/obj/item/weapon/storage/box/syringes
name = "box of syringes"
desc = "A box full of syringes."
desc = "A biohazard alert warning is printed on the box."
icon_state = "syringe"
/obj/item/weapon/storage/box/syringes/New()
-2
View File
@@ -2,8 +2,6 @@
//Chef
/obj/item/clothing/head/chefhat
name = "chef's hat"
desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
icon_state = "chef"
item_state = "chef"
desc = "The commander in chef's head wear."
strip_delay = 10
+1 -2
View File
@@ -1,7 +1,6 @@
//Regular syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
desc = "Top secret spess helmet."
icon_state = "syndicate"
item_state = "syndicate"
desc = "Has a tag: Totally not property of an enemy corporation, honest."
@@ -146,4 +145,4 @@
/obj/item/clothing/suit/space/syndicate/black/engie
name = "black engineering space suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
item_state = "syndicate-black"
@@ -294,8 +294,6 @@
// Bowl ////////////////////////////////////////////////
/obj/item/weapon/reagent_containers/glass/bowl
name = "bowl"
icon_state = "snack_bowl"
name = "bowl"
desc = "A simple bowl, used for soups and salads."
icon = 'icons/obj/food/soupsalad.dmi'
@@ -625,7 +625,6 @@
item_state = "staffofstorms"
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
w_class = 4
force = 25
damtype = BURN
+1 -2
View File
@@ -9,7 +9,6 @@
icon_state = "mining_drone"
icon_living = "mining_drone"
status_flags = CANSTUN|CANWEAKEN|CANPUSH
stop_automated_movement_when_pulled = 1
mouse_opacity = 1
faction = list("neutral")
a_intent = "harm"
@@ -282,4 +281,4 @@
origin_tech = "programming=6"
#undef MINEDRONE_COLLECT
#undef MINEDRONE_ATTACK
#undef MINEDRONE_ATTACK
@@ -22,7 +22,6 @@
icon_state = "drone_maint_grey"
icon_living = "drone_maint_grey"
icon_dead = "drone_maint_dead"
gender = NEUTER
health = 30
maxHealth = 30
unsuitable_atmos_damage = 0
@@ -9,7 +9,6 @@
maxHealth = 5
faction = list("Lizard")
attacktext = "bites"
attacktext = "bites"
melee_damage_lower = 1
melee_damage_upper = 2
response_help = "pets"
@@ -38,4 +37,4 @@
target = null
adjustBruteLoss(-2)
else
..()
..()
@@ -1,7 +1,6 @@
/mob/living/simple_animal/hostile/creature
name = "creature"
desc = "A sanity-destroying otherthing."
speak_emote = list("gibbers")
icon_state = "otherthing"
icon_living = "otherthing"
icon_dead = "otherthing-dead"
@@ -622,7 +622,6 @@ Difficulty: Very Hard
languages_understood = ALL
del_on_death = 1
unsuitable_atmos_damage = 0
flying = 1
minbodytemp = 0
maxbodytemp = 1500
obj_damage = 0
@@ -147,7 +147,6 @@ Difficulty: Medium
item_state = "staffofstorms"
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
w_class = 4
force = 25
damtype = BURN
@@ -192,4 +191,4 @@ Difficulty: Medium
A.telegraph()
storm_cooldown = world.time + 200
#undef MEDAL_PREFIX
#undef MEDAL_PREFIX
@@ -413,7 +413,6 @@
icon_aggro = "Goliath_alert"
icon_dead = "Goliath_dead"
icon_gib = "syndicate_gib"
attack_sound = 'sound/weapons/punch4.ogg'
mouse_opacity = 2
move_to_delay = 40
ranged = 1
@@ -575,7 +574,6 @@
icon_aggro = "Fugu"
icon_dead = "Fugu_dead"
icon_gib = "syndicate_gib"
attack_sound = 'sound/weapons/punch4.ogg'
mouse_opacity = 2
move_to_delay = 5
friendly = "floats near"
@@ -5,7 +5,6 @@
icon_living = "clown"
icon_dead = "clown_dead"
icon_gib = "clown_gib"
speak_chance = 0
turns_per_move = 5
response_help = "pokes"
response_disarm = "gently pushes aside"
@@ -40,4 +39,4 @@
/mob/living/simple_animal/hostile/retaliate/clown/attack_hand(mob/living/carbon/human/M)
..()
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
@@ -264,8 +264,6 @@
/obj/item/weapon/gun/energy/gravity_gun
name = "one-point bluespace-gravitational manipulator"
icon_state = "gravity_gun"
item_state = "gravity_gun"
desc = "An experimental, multi-mode device that fires bolts of Zero-Point Energy, causing local distortions in gravity"
ammo_type = list(/obj/item/ammo_casing/energy/gravityrepulse, /obj/item/ammo_casing/energy/gravityattract, /obj/item/ammo_casing/energy/gravitychaos)
origin_tech = "combat=4;magnets=4;materials=6;powerstorage=4;bluespace=4"
-2
View File
@@ -188,7 +188,6 @@
/obj/docking_port/mobile
icon_state = "mobile"
name = "shuttle"
icon_state = "pinonclose"
@@ -661,4 +660,3 @@
dst = destination
. += " towards [dst ? dst.name : "unknown location"] ([timeLeft(600)] minutes)"
#undef DOCKING_PORT_HIGHLIGHT