cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into achievement-get

Browse Source
This commit is contained in:
Gary Lafortune
2020-01-28 21:11:24 -06:00
committed by GitHub
parent 3bed9f8ce9 7633f47afa
commit e2cdc885fc
92 changed files with 1001 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystem/chat.dm
View File

@@ -51,7 +51,6 @@ SUBSYSTEM_DEF(chat)
C.chatOutput.messageQueue += message
continue
message = to_utf8(message, I) // yogs - LibVG
payload[C] += url_encode(url_encode(message))
else
@@ -64,5 +63,4 @@ SUBSYSTEM_DEF(chat)
C.chatOutput.messageQueue += message
return
message = to_utf8(message, target) // yogs - LibVG
payload[C] += url_encode(url_encode(message))

2
code/controllers/subsystem/mapping.dm
View File

@@ -329,7 +329,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
if (!pickedmap)
return
var/datum/map_config/VM = global.config.maplist[pickedmap]
message_admins("Randomly rotating map to [VM.map_name]")
message_admins("Randomly rotating map to [VM.map_name].")
. = changemap(VM)
if (. && VM.map_name != config.map_name)
to_chat(world, "<span class='boldannounce'>Map rotation has chosen [VM.map_name] for next round!</span>")

2
code/controllers/subsystem/traumas.dm
View File

@@ -120,7 +120,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/glasses/judicial_visor, /obj/effect/clockwork/sigil/, /obj/item/stack/tile/brass,
/obj/machinery/door/airlock/clockwork,
/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/clothing/head/wizard/armor, /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/gun/magic/staff, /obj/item/gun/magic/wand,
/obj/item/nullrod, /obj/item/clothing/under/rank/chaplain)),