Here I fix a few issues.

This commit is contained in:
Ghommie
2020-10-25 14:50:42 +01:00
parent 4534dec889
commit 90c4cb2022
25 changed files with 80 additions and 84 deletions
-11
View File
@@ -5,17 +5,6 @@
/datum/keybinding/human/can_use(client/user)
return ishuman(user.mob)
/datum/keybinding/human/quick_equip
hotkey_keys = list("E")
name = "quick_equip"
full_name = "Quick Equip"
description = "Quickly puts an item in the best slot available"
/datum/keybinding/human/quick_equip/down(client/user)
var/mob/living/carbon/human/H = user.mob
H.quick_equip()
return TRUE
/datum/keybinding/human/quick_equipbelt
hotkey_keys = list("ShiftE")
name = "quick_equipbelt"
@@ -5,6 +5,17 @@
/datum/keybinding/living/can_use(client/user)
return isliving(user.mob)
/datum/keybinding/living/quick_equip
hotkey_keys = list("E")
name = "quick_equip"
full_name = "Quick Equip"
description = "Quickly puts an item in the best slot available"
/datum/keybinding/living/quick_equip/down(client/user)
var/mob/living/carbon/human/H = user.mob
H.quick_equip()
return TRUE
/datum/keybinding/living/resist
hotkey_keys = list("B")
name = "resist"
@@ -202,7 +202,7 @@
var/obj/item/reagent_containers/food/snacks/donkpocket/warm/W = new(src)
load(W)
if(prob(50))
var/obj/item/storage/box/dice/D = new(src)
var/obj/item/storage/dice/D = new(src)
load(D)
else
var/obj/item/instrument/guitar/G = new(src)
@@ -651,11 +651,11 @@
name = "Fennec"
icon_state = "fennec"
/datum/sprite_accessory/tails/mam_tails/human/fish
/datum/sprite_accessory/tails/mam_tails/fish
name = "Fish"
icon_state = "fish"
/datum/sprite_accessory/tails_animated/mam_tails_animated/human/fish
/datum/sprite_accessory/tails_animated/mam_tails_animated/fish
name = "Fish"
icon_state = "fish"
@@ -668,7 +668,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.remove_overlay(BODY_FRONT_LAYER)
H.remove_overlay(HORNS_LAYER)
if(!mutant_bodyparts)
if(!length(mutant_bodyparts))
return
var/tauric = mutant_bodyparts["taur"] && H.dna.features["taur"] && H.dna.features["taur"] != "None"
+1 -1
View File
@@ -4,7 +4,7 @@
product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
icon_state = "games"
products = list(/obj/item/toy/cards/deck = 5,
/obj/item/storage/box/dice = 10,
/obj/item/storage/dice = 10,
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3,
/obj/item/toy/cards/deck/unum = 3)