Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 22:47:19 +00:00

Files

kingofkosmos 52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1

# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm

2019-10-17 06:02:06 +03:00

appendix.dm

[TMC] Defib Rework, Organ Damage Effects (#45104 )

2019-07-29 02:18:22 -07:00

augments_arms.dm

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525 )

2019-10-08 11:06:02 -04:00

augments_chest.dm

[TMC] Defib Rework, Organ Damage Effects (#45104 )

2019-07-29 02:18:22 -07:00

augments_eyes.dm

Removes a bunch of var/ in procs (#46946 )