Commit Graph
7653 Commits
Author SHA1 Message Date
Markolie 269253d5d2 SyndiBorg flash removed, CentCom access update 2014-11-23 08:23:52 +01:00
Markolie 74e72cdad6 Add hud icons for various jobs 2014-11-23 07:58:49 +01:00
Markolie 30c1960fe8 Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes 2014-11-23 07:52:38 +01:00
Markolie dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00
Markolie e9fc80fe7f Re-add harmbatonning. Adds forcesay: if you're typing when you get hit by a stun weapon, you say a garbled version of what you were typing (from /tg/). 2014-11-22 20:22:28 +01:00
Markolie fd064b8e35 Teleporter can no longer lock on to syndicate beacons. Teleporter/beacons can be emagged to enable syndicate option. 2014-11-22 07:54:13 +01:00
Markolie c0f1c92bef Windoor damage fix, allows deconstruction of windoors 2014-11-22 06:48:51 +01:00
Markolie 107325bb43 Melee attack for mechs 2014-11-22 06:05:13 +01:00
Markolie 9bd63e8c84 Upping the research levels for the Phazon 2014-11-22 05:35:09 +01:00
Markolie 2c2c7fc517 Constructable Phazon, constructable display case 2014-11-22 05:15:44 +01:00
Markolie 42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Markolie 229824afc4 Fix duplicate numbers in autolathe 2014-11-22 00:59:24 +01:00
Markolie 24fcbb5de4 Autolathe fix 2014-11-22 00:53:09 +01:00
Markolie 1269fe7d4e Fix encryption key name 2014-11-21 23:58:13 +01:00
Markolie b64a09ec6c Fix grilles 2014-11-21 19:15:42 +01:00
Markolie 6595b8c38e Fix cloning/telebaton 2014-11-21 04:31:38 +01:00
Markolie 421c461705 Some more map fixes 2014-11-21 03:17:10 +01:00
Markolie e9e3705e61 Minor map fixes, teleporter description fix 2014-11-21 01:18:41 +01:00
Markolie 06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
Markolie c2ce8a63b9 Merge conflict 2014-11-20 22:43:31 +01:00
Markolie dc2efa6dbb Fixing merge conflict 2014-11-20 22:41:34 +01:00
Markolie 03ef55ca4d And recommitting my changes 2014-11-20 22:39:03 +01:00
Mark van Alphen e3443532c0 Merge pull request #4 from ZomgPonies/master
Upstream merge
2014-11-20 22:37:35 +01:00
Markolie 63cb529297 See if this fixes the conflict 2014-11-20 22:37:13 +01:00
Fox-McCloud 16b525684c Merge pull request #500 from SamCroswell/master
Updates
2014-11-20 16:09:51 -05:00
Markolie 3777f5c8bf Revert debugging 2014-11-20 20:56:34 +01:00
Markolie dd3739119e Properly document harmbatonning removal, window update check 2014-11-20 00:55:26 +01:00
Markolie e2e996fbbf Glass now changes color when built based on the area, map fixes 2014-11-20 00:08:29 +01:00
Markolie 8f47f50009 Fix stun batons and holographic sign projectors 2014-11-19 20:20:10 +01:00
Markolie dc89eaba1a Debugging 2014-11-19 02:24:07 +01:00
Markolie d490c939c0 Capitalization fix 2014-11-19 01:31:34 +01:00
Markolie 59edf2701d Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders 2014-11-18 20:36:40 +01:00
Markolie 3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Markolie 2f7d3ae26d Additional constructable and upgradeable machines, adds soap to drones, updates teleporter 2014-11-18 03:13:12 +01:00
Mark van Alphen f1278b799d Merge pull request #1 from ZomgPonies/master
Upstream merge
2014-11-17 08:48:31 +01:00
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Mark van Alphen a0bc630efb Update firedoor.dm 2014-11-16 17:00:17 +01:00
Markolie cbe2bee4c2 Crazy amount of map fixes. 2014-11-15 01:39:00 +01:00
SamCroswell d2d02e400a Syni Venors 2014-11-14 15:41:55 -05:00
Markolie e49e9a8fbf Make sure Beepsky doesn't arrest the NT Rep for carrying his cane 2014-11-14 20:34:55 +01:00
Markolie fa8ecd6527 Fix APC runtime error, open nuke interface when inserting disk 2014-11-14 18:37:21 +01:00
Markolie 069cabebf6 Fixes runtime error when fire doors are closed, allows AI/borgs to access firedoors. 2014-11-14 17:03:41 +01:00
Markolie b2d0e26a6d Add meson goggles to atmos lockers, add alert camera monitors to engineering 2014-11-14 15:55:38 +01:00
Markolie fb34be5c28 Separate the Magistrate's Office from the IAA's Office 2014-11-14 15:09:05 +01:00
Markolie e9ee0579de Fix the incinerator doors, give atmos external airlock access so they can actually use their hardsuits (no other ways off the station) 2014-11-14 14:47:03 +01:00
Markolie 0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01:00
SamCroswell 6622d6105b Stop, HAMMER TIME! 2014-11-13 21:24:13 -05:00
SamCroswell e8e3f76ca2 Dual Eswords Now Deflect Shots 2014-11-12 22:06:48 -05:00
SamCroswell a59a535a0e Esword update 2014-11-12 17:52:00 -05:00
Fox-McCloud f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00