Commit Graph

8 Commits

Author SHA1 Message Date
GunHog
0bab26452b Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2016-02-08 08:50:44 -06:00
GunHog
e326c70ed9 Nitpick handling 2016-01-24 20:26:16 -06:00
GunHog
626db2832b Exosuit Medical Beamgun
Adds the Exosuit Medical Beamgun!
- Odysseus version of the Medical Beamgun
- Medical mech equipment is now under /medical/ to prevent copypaste
2016-01-24 17:38:14 -06:00
AnturK
229724a6e7 Fixes medbeam pass flags 2016-01-24 12:56:02 +01:00
AnturK
510d1acd06 Medbeam Fixes 2015-12-18 10:03:38 +01:00
Jordie
3889099444 relase > release 2015-12-16 21:49:17 +11:00
AnturK
ec85d5ceec Fixes beam crossing
Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
2015-12-12 12:26:37 +01:00
AnturK
f333562223 Adds Med Beam Gun 2015-12-11 12:01:28 +01:00