mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-09 16:14:13 +00:00
bb5a349fcf
Conflicts: baystation12.dme code/__HELPERS/global_lists.dm code/controllers/master_controller.dm code/game/gamemodes/events/ninja_equipment.dm code/game/gamemodes/events/space_ninja.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/hud.dm code/game/jobs/job/captain.dm code/game/jobs/job/job.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/machinery/computer/cloning.dm code/game/objects/items/blueprints.dm code/game/objects/items/weapons/gift_wrappaper.dm code/game/objects/items/weapons/implants/implantnanoaug.dm code/game/objects/items/weapons/storage/uplink_kits.dm code/game/objects/items/weapons/stunbaton.dm code/game/turfs/turf.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/masks/miscellaneous.dm code/modules/clothing/shoes/miscellaneous.dm code/modules/clothing/under/ties.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/silicon/say.dm code/modules/mob/mob_defines.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/pen.dm code/modules/paperwork/stamps.dm code/modules/projectiles/projectile.dm code/modules/reagents/Chemistry-Holder.dm code/modules/reagents/reagent_containers/glass.dm code/setup.dm config/config.txt html/changelog.html icons/effects/effects.dmi icons/mob/feet.dmi icons/mob/head.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/mask.dmi icons/mob/suit.dmi icons/mob/ties.dmi icons/mob/uniform.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/shoes.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/ties.dmi maps/tgstation.2.1.0.dmm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>