 barackobama
|
7dfcc292b7
|
add a variable to mmi to indicate if it's of the syndicate variety as
suggested
|
2015-06-28 12:44:25 +01:00 |
|
|
barackobama
|
0316a836cb
|
add a Syndicate surgery dufflebag full of tools to the uplink
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
|
2015-06-28 02:54:49 +01:00 |
|
 Iamgoofball
|
a8ec1c76df
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
|
2015-06-23 12:54:26 -07:00 |
|
 Remie Richards
|
c79963f7b7
|
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
Malf AI module changes + Mechs for normal AIs!
|
2015-06-21 00:30:03 +01:00 |
|
 phil235
|
e6dcabf245
|
Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
|
2015-06-18 15:50:35 +02:00 |
|
 GunHog
|
0b611acd7b
|
Compile fix
Fixes the things after resolving merge conflicts.
|
2015-06-15 12:15:29 -05:00 |
|
|
GunHog
|
bc11259282
|
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
Conflicts:
code/game/machinery/computer/aifixer.dm
|
2015-06-15 11:27:11 -05:00 |
|
 Jordie0608
|
8fc003029c
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
|
2015-06-15 16:34:56 +10:00 |
|
|
Iamgoofball
|
a00e11520c
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
|
2015-06-14 15:42:15 -07:00 |
|
 xxalpha
|
b2e84a0d3c
|
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
|
2015-06-14 20:11:40 +01:00 |
|
|
Jordie0608
|
5ef93b2225
|
overlays for computers
|
2015-06-13 20:07:48 +10:00 |
|