Merge pull request #905 from Zuhayr/resomi

Seromi rename.
This commit is contained in:
EmperorJon
2016-02-06 02:24:45 +00:00
18 changed files with 42 additions and 38 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
item_state = "electronic"
w_class = 2.0
slot_flags = SLOT_ID | SLOT_BELT
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/id.dmi')
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/id.dmi')
//Main variables
var/pdachoice = 1
+1 -1
View File
@@ -95,7 +95,7 @@
item_state = "card-id"
sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/id.dmi'
"Teshari" = 'icons/mob/species/seromi/id.dmi'
)
var/access = list()
+1 -1
View File
@@ -17,7 +17,7 @@
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
var/cuff_sound = 'sound/weapons/handcuffs.ogg'
var/cuff_type = "handcuffs"
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/handcuffs.dmi')
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
/obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)
@@ -18,7 +18,7 @@
slot_r_hand_str = "backpack",
)
sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/back.dmi'
"Teshari" = 'icons/mob/species/seromi/back.dmi'
)
w_class = 4
slot_flags = SLOT_BACK
@@ -6,7 +6,7 @@
item_state = "utility"
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
sprite_sheets = list("Seromi" = 'icons/mob/species/seromi/belt.dmi')
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/belt.dmi')
var/show_above_suit = 0
@@ -24,7 +24,7 @@ var/list/global/tank_gauge_cache = list()
throw_range = 4
sprite_sheets = list(
"Seromi" = 'icons/mob/species/seromi/back.dmi'
"Teshari" = 'icons/mob/species/seromi/back.dmi'
)
var/datum/gas_mixture/air_contents = null