Commit Graph

3561 Commits

Author SHA1 Message Date
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
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
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
06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +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
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
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +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
0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01: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
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
Fox-McCloud
37b1113ce6 Merge pull request #483 from SamCroswell/master
ESword Changes
2014-11-08 21:38:00 -05: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
SamCroswell
28c15dcc26 ESword Changes
- All weapons now have a 'no_embed' var. If this var is set to 1 (It is
0 by default) the item will bypass checks to embed into people during
melee combat and when thrown. This is intended to be used for items such
as the esword, where it is physically impossible for it to be embedded
into someone, as opposed to something like the telebaton, where it's
simply improbably that would get embedded into anyone.

- All energy-based melee weapons have no_embed set to 1.

- All energy-based melee weapons now have a more appropriate hitsound
when active. See: blade1.ogg
2014-11-08 14:12:11 -05:00
Fox-McCloud
6dfc1f4d70 Merge pull request #482 from SamCroswell/master
Nukeops Update
2014-11-08 11:05:51 -05:00
Fox-McCloud
bf867da403 Merge pull request #469 from Nienhaus/master
Adds EngiCart
2014-11-08 10:58:25 -05:00
SamCroswell
722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
Fox-McCloud
bf93e9caaf Jetpacks for Sydnies! 2014-11-08 01:15:46 -05:00
Nienhaus
25a92c91fd Ports the TG style Jani Cart. 2014-11-07 22:48:44 -06:00
Nienhaus
6cfd8b7076 Adds EngiCart
http://i.imgur.com/18w9fkq.png Can hold three toolboxes, metal, plasteel, glass, tape, and a flashlight.
2014-11-07 19:18:48 -06:00
DZD
489bff2983 Rolling Paper Icon Fix
Fixes icon_state of individual sheets of rolling paper so they actually
show a sprite.
2014-11-07 16:09:50 -05:00
Fox-McCloud
a8bda9d958 Merge pull request #438 from Bram961/master
Pirate outfit
2014-11-07 10:40:46 -05:00
SamCroswell
40ba16c708 Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-11-06 16:38:55 -05:00
Fox-McCloud
e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -05:00
Fox-McCloud
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
Markolie
f150cabd19 Lockers can now be closed if they are in front of a fireaxe cabinet (or any other closet object which is anchored and as such can not be stored). 2014-11-05 18:29:05 +01:00
Markolie
3c6c11c22d Also prevents lockers from being (un)welded from inside. 2014-11-05 18:09:47 +01:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
SamCroswell
ed2be54841 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-04 21:00:57 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Markolie
69aad225d0 Fix space. 2014-11-04 03:14:35 +01:00
Markolie
a0abc79368 Personal lockers can no longer be locked from the inside. Also fixes the "It won't budge" message which kept appearing. Per https://github.com/ZomgPonies/Paradise/issues/452. 2014-11-04 03:13:03 +01:00
DZD
e886c3d982 Merge remote-tracking branch 'upstream/master' 2014-11-01 16:14:34 -04:00
Fox-McCloud
c879ead4f7 Music Updates 2014-10-31 21:55:25 -04:00
DZD
6863cdfb2d Fixes Table Climbing Edge Case with Windoors
With the fix that I had implemented to prevent climbing through solid
objects, a windoor on the other side of a table would prevent climbing,
now the check ignores windoors, as they already block climbing from the
same side.
2014-10-30 20:20:45 -04:00