CHOMPstation

mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-16 17:42:32 +01:00

Files

T

History

Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

arm_guards_vr.dm

Imperial Military Update

2017-09-02 04:07:25 -04:00

arm_guards.dm

Steals more modular armor code

2018-02-16 18:41:07 -06:00

boxing.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

color.dm

Small Fixes and Refactor (#4819 )