Commit Graph

3337 Commits

Author SHA1 Message Date
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
Ikarrus db7cb79509 Resolved Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 08:51:39 -06:00
Jordie 4928617c2b Merge pull request #10334 from xxalpha/jetbutt
Added ability for items inside items to have action buttons.
2015-07-09 20:51:29 +10:00
Jordie 1714a8ee10 Merge pull request #10447 from xxalpha/plasmafix
Fixed plasma not stacking.
2015-07-09 20:45:21 +10:00
MrStonedOne a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
xxalpha e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 02:40:21 +01:00
Cheridan 2c3c8d7ae3 Merge pull request #10455 from Ikarrus/cyborgobjectives
Borging Antagonists
2015-07-08 17:40:01 -05:00
Ikarrus 12eb6a06cd Squash and revert map change 2015-07-08 15:12:00 -06:00
Ikarrus 3f21a78ab7 Adds a Hugbox
You can hug it.
2015-07-08 10:30:21 -06:00
Swag McYolosteinen d826a19f81 Merge pull request #9934 from nukeop/rcd
Makes RCDs more useful
2015-07-08 16:03:31 +02:00
Ikarrus 4c4d1aaae4 Rewording 2015-07-07 20:37:07 -06:00
xxalpha 7dcf3623e5 Removed image instantiation for faster smoothing. 2015-07-08 02:17:16 +01:00
xxalpha e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-08 00:43:02 +01:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
Ikarrus 3497744234 Makes it really obvious that antags no longer have objectives after being borged
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
2015-07-07 15:11:53 -06:00
xxalpha 49cb301318 Fixed plasma not stacking. 2015-07-07 17:38:23 +01:00
Cheridan 65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin
Fixed Badmins being able to exceed the gang limit with excessive buttons
2015-07-07 08:57:30 -05:00
Ikarrus e67b18d93e - Fixed bug that prevented implant breakers from recruiting security.
- Gangs are reminded of imminent defeat/victory and the dominator's location when a timer drops below 3 minutes. (+3 squashed commit)

Squashed commit:

[49b614c] - Raised threshold of station damage before gang heads can no longer recall
- Implanters are now only blocked by helmets with THICKMATERIAL
- Changelog

[76f9662] Fixes runtime with gang messages sent to minds without mobs

[d81148e] Speeds up recruitment a bit (+1 squashed commits)

Squashed commits:

[d81148e] Speeds up recruitment a bit
2015-07-06 22:29:29 -06:00
xxalpha 8d96d87337 smoothed balls 2015-07-06 18:16:18 +01:00
WJohn 7ffd779b24 Merge pull request #10256 from AnturK/sword
Makes claymore back wearable
2015-07-06 11:44:56 -04:00
barackobama 58af0dd402 remove debug messages 2015-07-05 22:22:36 +01:00
xxalpha e56df69012 Restores ability to insert lighters into cigarette packs. 2015-07-05 00:44:39 +01:00
Cheridan 447d7651eb Merge pull request #10299 from xxalpha/runtimesrun
Fixed T-Scanners runtime error
2015-07-04 12:44:23 -05:00
Swag McYolosteinen a4b60449f8 Merge pull request #10129 from AnturK/ayy
Abductors fixes and improvements
2015-07-04 16:57:10 +02:00
Cheridan 7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
xxalpha 8e8d9157d3 Fixed runtime with t_scanners.
Now it's fixed.
2015-07-03 12:16:22 +01:00
Ikarrus 3814dc208a Gang-Based Datums 2015-07-02 22:18:11 -06:00
MrStonedOne ed9238600e Revert "Fixes overexcited TTV reporting" 2015-07-02 16:34:22 -07:00
Cheridan b2ab5d84d1 Merge pull request #10309 from Ikarrus/holyshitsecbuffshutitdownikarrusisshit
Flashes and Flashers
2015-07-02 22:50:28 -05:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Razharas d03006d17b Merge pull request #10304 from TheVekter/dogbedwoofwoof2
Replaces the crate in HoP's office with a dog bed
2015-07-03 04:27:48 +03:00
Ikarrus 24891ba762 Reduced aoe flashes to just one tick 2015-07-02 19:05:29 -06:00
xxalpha b563d5fbf4 Added ability for items inside items to have action buttons. 2015-07-03 00:33:02 +01:00
Ikarrus 25b134581b Resolved Conflicts:
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
xxalpha 4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
Razharas f54e2bee2b Merge pull request #10310 from Ikarrus/variableburntimes
Items have a variable burn time
2015-07-02 19:39:40 +03:00
Ikarrus 6595a39147 Plasma sheets can burn now 2015-07-01 13:33:05 -06:00
Ikarrus 55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
WJohn cf921dec58 Merge pull request #10163 from RemieRichards/TableCraftingUnFucking
Table Crafting Update
2015-07-01 14:29:55 -04:00
Razharas ce02df75f8 Merge pull request #10285 from Ikarrus/gangimplantmania
Gang Update: Implants Edition
2015-07-01 18:43:21 +03:00
Jordie be391f52ff Merge pull request #9840 from xxalpha/niggastolemynuke
New traitor objective: Nuke Heist
2015-07-01 18:58:00 +10:00
TheVekter 27ed60102d They're craftable now! 2015-07-01 00:41:49 -05:00
Remie Richards cd36b1665b Merge pull request #10202 from nullstation/hi-extended
HTML interface module: Port of the crew monitoring computer
2015-07-01 05:59:39 +01:00
Ikarrus 02a60c6e89 Flashes and Flashers 2015-06-30 22:20:20 -06:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus b6dd414087 Reverted recall changes 2015-06-30 18:28:01 -06:00
Ikarrus 1e30fc4b6c Gang Update: Implants Edition
- Multiple gang leaders are spawned at round start, the number which depends on server population
- Only one boss per gang, the rest are lieutenants
- Only the gang boss can recall the shuttle
- Gangsters can no longer be promoted mid-game.
- Security can once again deconvert gangsters with loyalty implants
  - A message is shown if the deconversion destroys the implant in the process

- Added an Implant Breaker item to the gangtool as a purchasable item for 10 influence each
  - They are a one-use item that destroys all implants in the target, including loyalty implants
  - They will also attempt to recruit the target before destroying itself
  - As this is an implanter it requires the target to remain still for a few seconds to administer it
- Implanters no longer work if the target is wearing headgear. Remove them first

- Added help text whenever you buy certain items from the gangtool
- Spare gangtools now cost 30 influence for everyone
  - They no longer give you a free pen
- Increases domination limit back to 3
- Purchased outfits are automatically equipped in your hand, if possible
- Gang boss has a 3 minute window at round start to select an outfit style. If he doesn't select one, the his lieutenants may pick one. No gang outfits can be created without a style picked first.
  - This is just to give the gang boss the first opportunity to pick an outfit style for his gang
- You can now see how many outfits your gangtool has in stock
- Outfits are no longer used up if you cancel the style selection prompt
- Loyalty implant destruction message has been moved to its Destroy()
2015-06-29 23:50:06 -06:00
Cheridan 604bcdef68 Merge pull request #10206 from Dorsisdwarf/smokeforyourhp
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine.
2015-06-29 22:20:51 -05:00