Commit Graph

10065 Commits

Author SHA1 Message Date
Fox-McCloud 99c7c4b667 Merge pull request #493 from nicky89107/master
Gibbing sound effects and screams + clarifying admin OOC color verb's name.+ Machine people *buzz *ping and *beep emotes -Tigercat2000
2014-11-22 21:38:03 -05:00
Fox-McCloud 2727a1143f Merge pull request #512 from Markolie/master
Re-add harmbatonning, add forcesay, psych office locker
2014-11-22 15:37:38 -05: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
Fox-McCloud f43ae4a8f8 Merge pull request #511 from SamCroswell/master
Adds Duffelbags, Hammer Inhand Fix, Weapon Description Update
2014-11-22 13:40:10 -05:00
SamCroswell 90bb1c5861 Weapon description update
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
Fox-McCloud 222e26e23f Merge pull request #508 from Markolie/master
Fixes grilles, constructable machine upgrade, proper hardsuit conversion, R&D updates, constructable display case
2014-11-22 00:57:02 -05: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
DZD 0f0829ea78 Merge remote-tracking branch 'upstream/master' 2014-11-21 22:47:05 -05:00
Markolie 42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Markolie e0234565bc Remove the duplicate decloner 2014-11-22 00:37:55 +01:00
Markolie 1269fe7d4e Fix encryption key name 2014-11-21 23:58:13 +01:00
Markolie 7415d1be99 Add the decloner to R&D 2014-11-21 21:50:01 +01:00
Markolie 3d806081d0 Let protolathe's be loaded with chemicals again, let circuitprinter drop chemicals when deconstructed 2014-11-21 21:39:43 +01:00
Markolie 5b3df5a690 Fix names of scanning modules 2014-11-21 19:40:31 +01:00
Tigercat2000 08016a957d Adds Machine-People specific *buzz *ping and *beep emotes. 2014-11-20 21:36:10 -08:00
Tigercat2000 067d9565e3 Changes the button for admin OOC color to be descriptive of such. "OOC
Text Color" to "Personal OOC Text Color"
2014-11-20 20:13:31 -08:00
Markolie 06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
Markolie d8f568494d Let AI state laws over specified channel, lets borgs state laws 2014-11-20 22:27:47 +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 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
DZD 84bffd2985 Space Helmets No Longer Fall Off
This includes all hardsuits and such, everything based off the
"/obj/item/clothing/head/helmet/space" class. The Ninja helmet is a
child of it, so the line making it not fall off becomes redundant.
2014-11-16 19:51:43 -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
Markolie fa8ecd6527 Fix APC runtime error, open nuke interface when inserting disk 2014-11-14 18:37:21 +01:00
Markolie 0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01:00
LazureusFalcone c75ddcb5fd Update lib_machines.dm
Made a small tweak to the Library Machines file in hopes to make it work again.. changed code between lines 359 and 383

This needs testing still as I was unable to connect to the SQL server locally but the live game is able to.
2014-11-12 08:09:34 -05:00
Fox-McCloud f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Mark van Alphen cbe6479b17 Merge pull request #1 from ZomgPonies/master
Upstream merge
2014-11-09 04:34:19 +01: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
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
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
Fox-McCloud a8bda9d958 Merge pull request #438 from Bram961/master
Pirate outfit
2014-11-07 10:40:46 -05:00
melandor0 01cc6409e7 supermatter drill
New traitor item
2014-11-06 19:28:34 +01: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
Fox-McCloud dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud 650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00