shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13627 from Ghommie/Ghommie-cit841

Browse Source 
Here I fix a few issues.
This commit is contained in:
silicons
2020-10-28 07:53:22 -07:00
committed by GitHub
parent 2d842270f5 444a440fba
commit 0307884eab
26 changed files with 80 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/accents.dm
+6 -9
View File
@@ -25,18 +25,15 @@
/datum/accent/abductor/modify_speech(list/speech_args, datum/source)
var/message = speech_args[SPEECH_MESSAGE]
var/mob/living/carbon/human/user = source
var/mob/living/carbon/user = source
var/obj/item/organ/tongue/abductor/A = user.getorgan(/obj/item/organ/tongue/abductor)
var/rendered = "<span class='abductor'><b>[user.name]:</b> [message]</span>"
user.log_talk(message, LOG_SAY, tag="abductor")
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
if(!T || T.type != type)
for(var/mob/living/carbon/C in GLOB.alive_mob_list)
var/obj/item/organ/tongue/abductor/T = C.getorgan(/obj/item/organ/tongue/abductor)
if(!T || T.mothership != A.mothership)
continue
if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor")
var/datum/antagonist/abductor/A = user.mind.has_antag_datum(/datum/antagonist/abductor)
if(!A || !(H.mind in A.team.members))
continue
to_chat(H, rendered)
to_chat(C, rendered)
for(var/mob/M in GLOB.dead_mob_list)
var/link = FOLLOW_LINK(M, user)
to_chat(M, "[link] [rendered]")
code/datums/action.dm
+1 -1
View File
@@ -174,7 +174,7 @@
M.ghostize(can_reenter_corpse = TRUE, voluntary = TRUE)
/datum/action/proc/OnUpdatedIcon()
UpdateButtonIcon()
addtimer(CALLBACK(src, .proc/UpdateButtonIcon), 1) //Hopefully runs after new icon overlays have been compiled.
//Presets for item actions
/datum/action/item_action
code/game/machinery/telecomms/machines/message_server.dm
+4 -4
View File
@@ -28,10 +28,10 @@
if(!do_after(user, 30 SECONDS, TRUE, src))
to_chat(user, "<span class='warning'>Your fingers slip as you fail to pry the [stored] from the [src], clicking it right back into the slot!</span>")
return
if(user.put_in_hands(stored))
stored.forceMove(user.drop_location())
user.put_in_hands(stored)
to_chat(user, "<span class='warning'>You successfully pry the [stored] from the [src]\
[user.is_holding(stored) ? "" : ", and send its overwhelming weight tumbling onto the ground"]! The tapes on the [src] stop spinning...</span>")
stored = null
to_chat(user, "<span class='warning'>You successfully pry the [stored] from the [src], and send its overwhelming weight tumbling onto the ground! The tapes on the [src] stop spinning...</span>")
update_icon()
return
else
@@ -41,7 +41,7 @@
/obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params)
. = ..()
if(istype(I, /obj/item/blackbox))
if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src))
if(!user.transferItemToLoc(I, src))
to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
return
user.visible_message("<span class='notice'>[user] clicks the [I] into the [src]!</span>", \
code/game/objects/effects/spawners/lootdrop.dm
+2 -2
View File
@@ -464,7 +464,7 @@
/obj/effect/spawner/lootdrop/cigars_cases/no_turf = 2,
/obj/effect/spawner/lootdrop/space_cash/no_turf = 5,
/obj/item/reagent_containers/food/snacks/grown/cannabis = 5,
/obj/item/storage/box/dice = 5,
/obj/item/storage/dice = 5,
/obj/item/toy/cards/deck = 5,
/obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5
)
@@ -483,7 +483,7 @@
/obj/effect/spawner/lootdrop/cig_packs/no_turf = 10,
/obj/effect/spawner/lootdrop/cigars_cases/no_turf = 5,
/obj/item/reagent_containers/food/snacks/grown/cannabis = 5,
/obj/item/storage/box/dice = 5,
/obj/item/storage/dice = 5,
/obj/item/toy/cards/deck = 5,
/obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5,
/obj/item/kitchen/knife = 5,
code/game/objects/items/RSF.dm
+1 -1
View File
@@ -93,7 +93,7 @@ RSF
use_matter(50, user)
if(4)
to_chat(user, "Dispensing Dice Pack...")
new /obj/item/storage/box/dice(T)
new /obj/item/storage/dice(T)
use_matter(200, user)
if(5)
to_chat(user, "Dispensing Cigarette...")
code/game/objects/items/dice.dm
+20 -21
View File
@@ -1,39 +1,38 @@
/obj/item/storage/box/dice
/*****************************Dice Bags********************************/
/obj/item/storage/dice
name = "bag of dice"
desc = "Contains all the luck you'll ever need."
icon = 'icons/obj/dice.dmi'
icon_state = "dicebag"
w_class = WEIGHT_CLASS_SMALL
var/list/special_die = list(
/obj/item/dice/d1,
/obj/item/dice/d2,
/obj/item/dice/fudge,
/obj/item/dice/d6/space,
/obj/item/dice/d00,
/obj/item/dice/eightbd20,
/obj/item/dice/fourdd6,
/obj/item/dice/d100
)
/obj/item/storage/box/dice/Initialize()
. = ..()
var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
if(special_die == "1")
new /obj/item/dice/d1(src)
if(special_die == "2")
new /obj/item/dice/d2(src)
/obj/item/storage/dice/PopulateContents()
new /obj/item/dice/d4(src)
new /obj/item/dice/d6(src)
if(special_die == "fudge")
new /obj/item/dice/fudge(src)
if(special_die == "space")
new /obj/item/dice/d6/space(src)
new /obj/item/dice/d8(src)
new /obj/item/dice/d10(src)
if(special_die == "00")
new /obj/item/dice/d00(src)
new /obj/item/dice/d12(src)
new /obj/item/dice/d20(src)
if(special_die == "8bd20")
new /obj/item/dice/eightbd20(src)
if(special_die == "4dd6")
new /obj/item/dice/fourdd6(src)
if(special_die == "100")
new /obj/item/dice/d100(src)
var/picked = pick(special_die)
new picked(src)
/obj/item/storage/box/dice/suicide_act(mob/user)
/obj/item/storage/dice/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (OXYLOSS)
/*****************************Dice********************************/
/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
name = "die"
desc = "A die with six sides. Basic and serviceable."
code/modules/keybindings/keybind/human.dm
-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"
code/modules/keybindings/keybind/living.dm
+11
View File
@@ -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"
code/modules/keybindings/keybind/robot.dm
-14
View File
@@ -59,17 +59,3 @@
var/mob/living/silicon/robot/R = user.mob
R.uneq_active()
return TRUE
/datum/keybinding/robot/drone/can_use(client/user)
return isdrone(user.mob)
/datum/keybinding/robot/drone/quick_equip_drone // QOL: Drone quickequip
hotkey_keys = list("E")
name = "quick_equip_drone"
full_name = "Quick Equip (Drone)"
description = "Quickly puts an item in the best slot available"
/datum/keybinding/robot/drone/quick_equip_drone/down(client/user)
var/mob/living/simple_animal/drone/D = user.mob
D.quick_equip()
return TRUE
code/modules/mining/equipment/survival_pod.dm
+1 -1
View File
@@ -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)
code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+2 -2
View File
@@ -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"
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -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"
code/modules/vending/games.dm
+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)