Committing work on away missions.

Standardised cigs_lighters.dm a bit.

Removed the SORD, and some unused and shit flasks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4609 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-09-02 23:58:11 +00:00
parent 6e925f0701
commit 08f350acda
18 changed files with 511 additions and 687 deletions
+12 -11
View File
@@ -1423,20 +1423,21 @@ proc/process_ghost_teleport_locs()
// Away Missions
/area/awaymission
name = "\improper Strange Location"
icon_state = "away"
/area/awaymission/example
name = "\improper Strange Station"
icon_state = "away"
/area/awaymission/desert
name = "Mars"
icon_state = "away"
/area/turret_protected/AssistantRoom
name = "\improper Assistant Room"
icon_state = "storage"
lighting_use_dynamic = 0
/////////////////////////////////////////////////////////////////////
/*
Lists of areas to be used with is_type_in_list.
-34
View File
@@ -76,18 +76,6 @@
throwforce = 10
w_class = 1
/obj/item/weapon/sord
name = "\improper SORD"
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
icon_state = "sord"
item_state = "sord"
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
force = 2
throwforce = 1
w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return ..()
@@ -721,28 +709,6 @@
icon_state = "fcardholder0"
item_state = "clipboard"
/obj/item/weapon/flasks
name = "flask"
icon = 'icons/obj/Cryogenic2.dmi'
var/oxygen = 0.0
var/plasma = 0.0
var/coolant = 0.0
/obj/item/weapon/flasks/coolant
name = "light blue flask"
icon_state = "coolant-c"
coolant = 1000.0
/obj/item/weapon/flasks/oxygen
name = "blue flask"
icon_state = "oxygen-c"
oxygen = 500.0
/obj/item/weapon/flasks/plasma
name = "orange flask"
icon_state = "plasma-c"
plasma = 500.0
/*
/obj/item/weapon/game_kit
name = "Gaming Kit"