Commit Graph

2954 Commits

Author SHA1 Message Date
duncathan 71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
xxalpha 66e2941531 Adds an empty hugbox for admins to give.
Maintbox

Re-added hugbox to boxstation perma.
2015-07-12 17:44:13 +01:00
Swag McYolosteinen 4878a7b8d5 Merge pull request #10531 from duncathan/rpddelay
Speeds up RPD and pipe unwrenching
2015-07-12 12:41:49 +02:00
duncathan 27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance
Makes augmentations more difficult to maintain
2015-07-11 19:54:58 -05:00
duncathan e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
barackobama f02c32c8ee fixes #10547, adds progress bars to grilles and windows, also fixes #9748
I guess
2015-07-11 19:49:32 +01:00
barackobama 2694fab4d8 fixes RCD-related issues 2015-07-11 19:15:33 +01:00
duncathan c870469a39 speeds up RPD and pipe unwrenching 2015-07-10 18:03:43 -06:00
phil235 7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay.
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
2015-07-10 22:29:06 +02:00
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
phil235 53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
phil235 d4cdd8eaa1 iron foam is now blue steel color just like aluminium foam.
Fixes metal foam from backpack firefighter watertank.
Fixes nanofrost not freezing shut vent scrubbers.
Atmos backpack watertank now starts full of water.
Change foam layer to Objlayer +0.1 so that it is above foammetalstructure so it doesn't hide the dissolving animation and also above tables.
Buff foam and smoke: smoke/foam contains four times the amount of reagents that was inserted in them, for balancing.
Add a little more smoke clouds for tear gas grenade.
Removed the no longer needed max_lifetime smoke var.
Reagent_dispensers (watertank) now show how much reagents they have left upon examination.
Fixed some code formatting in reagent_dispensers.
Fixes nanofrost temperature lowering effect that wasn't working.
Adjusted reagent volume in blob spore smoke because of the buff.
Change to sorium and ldm: effect varies with created volume.
If you are close to a powerful vortex you are thrown, otherwise you are just moved instead.
Vortex blobs now only make you step if you are far from it when reaction hits, otherwise it throws you. The vortex blob range gets +1 to compensate. Also the range and effect depends on the reagent volume which means lower effect for blobspore smoke.
2015-07-09 19:49:06 +02: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
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
Ikarrus b7df175981 Update 2015-07-08 21:31:23 -06:00
Ikarrus 20361faf02 Makes augmentations more difficult to maintain
Medical has had several overhauls, but none of them touched augmentations, so they became almost a no-contest better alternative than regular limbs in virtually every aspect.

- Repairing yourself is no longer instant, and will take longer than healing than biological medical items.
- EMP damage increased from basically nothing to actually dangerous
2015-07-08 21:12:44 -06: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
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
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
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
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03: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
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
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
Cheridan 3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
Cheridan 8ad1c54d4e Merge pull request #10221 from optimumtact/patch-5
Stop triggering myself when viewing fork code
2015-06-29 14:47:28 -05:00
AnturK 4ddfb3c65e Makes claymore back wearable 2015-06-29 13:08:48 +02:00
Cheridan 5fc029d63d Merge pull request #10215 from Ikarrus/freetheclothes
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
2015-06-28 18:16:04 -05:00
Ikarrus cbee684951 Macro/Micro bombs are now restricted to the Nuclear game mode.
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Orange Borg d8bc3acea2 Stop triggering myself when viewing fork code 2015-06-28 18:48:40 +12:00