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
Markolie
d8f568494d
Let AI state laws over specified channel, lets borgs state laws
2014-11-20 22:27:47 +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
4115c98d9d
Glass instead of wood for bottles
2014-11-18 17:34:01 +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
SamCroswell
c75529462d
Bulldog In-Hand Fix
2014-11-14 23:34:47 -05:00
Markolie
b0963fa860
Slime runtime error fixes, minor map fixes
2014-11-15 05:02:10 +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
Fox-McCloud
be3e2740c5
PDA Fix
2014-11-10 20:53:38 -05:00
Fox-McCloud
867a212dca
Merge pull request #487 from Markolie/nanoui
...
Update nuclear bomb's regular and hacking UI to NanoUI
2014-11-10 20:25:35 -05:00
Markolie
72a9ff4d24
And cleaning up redundant definitions
2014-11-11 00:54:31 +01:00
Markolie
bdeb72c771
Minor spacing fix
2014-11-11 00:53:23 +01:00
Markolie
f38782e300
Porting over fix for HTML injection exploit from /tg/
2014-11-11 00:48:15 +01:00
Markolie
be7634f610
Loyalty implants for ERT
2014-11-10 23:18:28 +01:00
Markolie
7311f945bb
Update nuclear bomb's regular and hacking UI to NanoUI
2014-11-10 20:15:27 +01:00
Fox-McCloud
a1a71006c0
Oops
2014-11-10 03:21:31 -05:00
Fox-McCloud
111b24ceb8
Janitor Rework
2014-11-10 03:17:56 -05:00
SamCroswell
46793a2c04
Poker table fix, two handed fix, Nukeops naming
...
- Poker tables now actually use the poker table icon. I don't reccomend
you use this, as the poker table icon doesn't mesh well as of right now.
Plan to fix that at a later date.
- Items that require two hands now properly update when
wielded/unweilded. Hooray.
- Minor changes to the way nukeops naming works.
2014-11-09 21:37:14 -05:00
Markolie
2e0953a767
And re-adding my changes.
2014-11-09 05:39:01 +01:00
Mark van Alphen
cbe6479b17
Merge pull request #1 from ZomgPonies/master
...
Upstream merge
2014-11-09 04:34:19 +01:00
Fox-McCloud
37b1113ce6
Merge pull request #483 from SamCroswell/master
...
ESword Changes
2014-11-08 21:38:00 -05:00
Markolie
1d4b9c36b2
Switch Keycard Authentication Device to NanoUI
2014-11-09 01:37:51 +01:00
SamCroswell
211023bd67
Syndicate Medibots, Energy Recharge Fix
...
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.
- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
