diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index ec7c1dfc7aa..8cc9f7b9895 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1647,10 +1647,12 @@
\ - The Tau Ceti Foreign Legion is a military force employed by the Republic of Biesel consisting of mostly volunteers of all recognized sentient citizens. It primarily - comprises of immigrants and external parties seeking citizenship or stakes in Tau Ceti, which the Republic offers in exchange for participation. It can often be seen - working with NanoTrasen assets wherever possible, extending operations slightly further than most NanoTrasen ERT officially reach. As such, the Foreign Legion can be - seen regularly patrolling areas nearby the N.S.S. Aurora and the Romanovich Cloud. + The Tau Ceti Foreign Legion is the primary armed force of the Republic of Biesel and is comprised of volunteer immigrants. External parties seeking citizenship \ + often enlist, since the Republic offers citizenship in turn for service. Since 2464 the Legion was promoted to the official armed forces of the Republic, which \ + resulted in a great boost in popularity, funding and manpower. This happened after President Dorn enacted the People's Protection Act megacorporations are also \ + able to fund the legion, something the Stellar Corporate Conglomerate immediately did. The Legion's largest deployment currently is throughout the Corporate \ + Reconstruction Zone, ensuring the SCC's growing influence over the region. To help with this task the Legion also seeks the assistance of the Private Military \ + Contracting Group. "} diff --git a/code/modules/cooking/machinery/gibber.dm b/code/modules/cooking/machinery/gibber.dm index f1f8872d72a..6efea814f7e 100644 --- a/code/modules/cooking/machinery/gibber.dm +++ b/code/modules/cooking/machinery/gibber.dm @@ -16,7 +16,7 @@ idle_power_usage = 2 active_power_usage = 500 - + //auto-gibs anything that bumps into it /obj/machinery/gibber/autogibber var/turf/input_plate @@ -121,7 +121,7 @@ to_chat(user, SPAN_DANGER("This is not suitable for [src]!")) return - if(ishuman(victim) && !emagged) + if(ishuman(victim) && !emagged && !victim.isMonkey()) to_chat(user, SPAN_DANGER("[src]'s safety guard is engaged!")) return diff --git a/html/changelogs/KingOfThePing - 14194.yml b/html/changelogs/KingOfThePing - 14194.yml new file mode 100644 index 00000000000..cdc3c4f3713 --- /dev/null +++ b/html/changelogs/KingOfThePing - 14194.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: KingOfThePing + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: +- bugfix: "Fixes the psych office having a duplicate air alarm." +- bugfix: "Fixes the gibber not accepting some simple mobs." +- bugfix: "Fixes the TCFL pamphlet being out of date lorewise." diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index bea13af698e..11cfa58a508 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -19238,10 +19238,6 @@ /area/security/checkpoint2) "kAM" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28 - }, /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet, /area/medical/psych)