Commit Graph
14122 Commits
Author SHA1 Message Date
Tigercat2000 5143a5848f Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-16 18:03:37 -08:00
Mark van Alphen a0bc630efb Update firedoor.dm 2014-11-16 17:00:17 +01: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
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
Tigercat2000 7c2b8c0e64 Add's a gibbing sound effect to the gibber. -Tigercat2000 2014-11-13 16:25:13 -08:00
Shadow Pandora eb039f804e Makes occupant scream while being gibbed. 2014-11-12 00:32:21 -08: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
Markolie 7405ae30ee Camera console network rework 2014-11-08 23:12:38 +01:00
SamCroswell 4ffd1a94e6 M1911P Fix
Forgot to reset the M1911P's weight and slot flags, since it's a child
of the pulse rifle. My bad.
2014-11-08 14:21:04 -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
Markolie 1494e9749e Camera consistency fixes round two. 2014-11-08 16:16:30 +01: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
SamCroswell a8a585ba32 Map Update, Pulse Rifle Change
Map changes:
- Genetics APC fixed.
- Gygax removed from the armory at Fox's request.
- AI chamber reverted at Fox's request.
- Updated admin room.

Pulse rifles may now only be carried on a person's back. Because we
don't allow fun here.

Fancy new L6 SAW icon as well.
2014-11-07 23:05:34 -05: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 4fa54c7dc0 Nuke Ops Map 2014-11-06 11:21:59 -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