0f0829ea78
Merge remote-tracking branch 'upstream/master'
2014-11-21 22:47:05 -05:00
42dd08ff7d
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation
2014-11-22 02:24:21 +01:00
229824afc4
Fix duplicate numbers in autolathe
2014-11-22 00:59:24 +01:00
24fcbb5de4
Autolathe fix
2014-11-22 00:53:09 +01:00
ef82aa2d70
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 20:59:46 -08:00
6595b8c38e
Fix cloning/telebaton
2014-11-21 04:31:38 +01:00
5eb90608fa
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 17:51:02 -08:00
e9e3705e61
Minor map fixes, teleporter description fix
2014-11-21 01:18:41 +01:00
c2ce8a63b9
Merge conflict
2014-11-20 22:43:31 +01:00
dc2efa6dbb
Fixing merge conflict
2014-11-20 22:41:34 +01:00
03ef55ca4d
And recommitting my changes
2014-11-20 22:39:03 +01:00
e3443532c0
Merge pull request #4 from ZomgPonies/master
...
Upstream merge
2014-11-20 22:37:35 +01:00
63cb529297
See if this fixes the conflict
2014-11-20 22:37:13 +01:00
16b525684c
Merge pull request #500 from SamCroswell/master
...
Updates
2014-11-20 16:09:51 -05:00
c79cb69c56
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 00:21:41 -08:00
e2e996fbbf
Glass now changes color when built based on the area, map fixes
2014-11-20 00:08:29 +01:00
dc89eaba1a
Debugging
2014-11-19 02:24:07 +01:00
59edf2701d
Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders
2014-11-18 20:36:40 +01:00
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
2f7d3ae26d
Additional constructable and upgradeable machines, adds soap to drones, updates teleporter
2014-11-18 03:13:12 +01:00
f1278b799d
Merge pull request #1 from ZomgPonies/master
...
Upstream merge
2014-11-17 08:48:31 +01:00
876a5067a0
Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes
2014-11-17 08:32:39 +01:00
5143a5848f
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-16 18:03:37 -08:00
0fd91f8a90
Merge remote-tracking branch 'upstream/master'
2014-11-16 18:03:55 -05:00
b89e99c054
Drag and Drop for Operating Table and Cryosleeper
...
-Allows drag + drop to work on operating tables, surgeon borgs can now
place players on operating table.
-Allows drag + drop to work on cryodorms cryopods, cyborgs can now place
SSDs in cryodorms.
2014-11-16 18:00:03 -05:00
a0bc630efb
Update firedoor.dm
2014-11-16 17:00:17 +01:00
d2d02e400a
Syni Venors
2014-11-14 15:41:55 -05:00
e49e9a8fbf
Make sure Beepsky doesn't arrest the NT Rep for carrying his cane
2014-11-14 20:34:55 +01:00
069cabebf6
Fixes runtime error when fire doors are closed, allows AI/borgs to access firedoors.
2014-11-14 17:03:41 +01:00
b2d0e26a6d
Add meson goggles to atmos lockers, add alert camera monitors to engineering
2014-11-14 15:55:38 +01:00
0cd3223536
AI fixes, borg fixes, map fixes
2014-11-14 14:15:17 +01:00
7c2b8c0e64
Add's a gibbing sound effect to the gibber. -Tigercat2000
2014-11-13 16:25:13 -08:00
cada511cb7
New Coffee Cup Sprite and New Canister
...
-Replaces coffee cup sprite with sprite by Nienhaus
-New atmos canister with sprite by Nienhaus, white base with red
stripes, useful for making custom mixes in order to avoid carrying
around a large yellow HAZARD tank.
2014-11-12 22:15:26 -05:00
eb039f804e
Makes occupant scream while being gibbed.
2014-11-12 00:32:21 -08:00
f84ca26012
Fixes and Stuff
2014-11-11 22:48:08 -05:00
111b24ceb8
Janitor Rework
2014-11-10 03:17:56 -05:00
2e0953a767
And re-adding my changes.
2014-11-09 05:39:01 +01:00
cbe6479b17
Merge pull request #1 from ZomgPonies/master
...
Upstream merge
2014-11-09 04:34:19 +01:00
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
7405ae30ee
Camera console network rework
2014-11-08 23:12:38 +01:00
a8bda9d958
Merge pull request #438 from Bram961/master
...
Pirate outfit
2014-11-07 10:40:46 -05:00
9b6dc5cdb5
Merge pull request #458 from Markolie/master
...
Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
2014-11-06 03:18:14 -05:00
dd200af4bf
Nuke Ops Rework Phase 2
2014-11-05 06:56:46 -05:00
4653d922af
Just as a safety precaution in case the client can unset the disabled option on the buttons.
2014-11-02 19:37:06 +01:00
904be8db74
Updated Telescience Console to use the updated Nano UI, rather than the regular pop-up UI. I was going to stick with just ensuring the console itself updates when you edit one of the coordinates (as previously you'd have to re-open the pop-up), but I figured I might as well update it to the newer Nano code.
2014-11-02 04:24:25 +01:00
cb33af8b48
SyndiBomb Fix
2014-10-31 00:19:10 -04:00
393ba993e2
Syndicate Bomb Port
2014-10-29 04:21:31 -04:00
939a82016c
Merge pull request #451 from Bone-White/master
...
Support Jobs on ID Comp Fix
2014-10-28 17:36:25 -04:00
46adb0dd0c
Support Jobs on ID Comp Fix
...
Finally puts support jobs back on the ID (HoP) computer.
Removed NT rep from the list of positions that can be chosen (as it's a
central assigned position only).
Slightly altered the colours of the interface to make it easier to read.
2014-10-28 11:39:12 +00:00
097cc95bd2
R&D Nerfs
2014-10-25 20:54:25 -04:00
DZD