Commit Graph

5408 Commits

Author SHA1 Message Date
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
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
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
c832f5dafd Items have a variable burn time
- Object burn times vary between 1x-2x the value set for var/burntime
  - This way they don't all burn up at the same time. For muh immersions.
- Examined ashes from burned objects will reveal what they used to be
2015-06-30 22:44:29 -06: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
87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
Cheridan
cb278febf6 Merge pull request #10237 from phil235/ShredsRuntimeFix
Fixes a runtime with shreds when it is burnt.
2015-06-29 21:21:42 -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
Razharas
5b5c03dd6b Merge pull request #10234 from Ikarrus/spraycanerror
Gang Tweaks + Fixes
2015-06-29 20:24:16 +03:00
Ikarrus
4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06: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
nullquery
6453882e37 Merge pull request #10 from nullstation/master
Merge with upstream
2015-06-28 23:03:23 +02:00
phil235
5f3bcf9eaf Fixes a runtime with cleanable/shreds when it is burnt. 2015-06-28 21:09:54 +02:00
Ikarrus
d07e315ddf Squashed 2015-06-28 12:11:05 -06:00
Ikarrus
5a7d43aedd Error message for trying use the spray can with the cap on 2015-06-28 11:18:29 -06: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
Ikarrus
c08cfb8018 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
Conflicts:
	code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -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
barackobama
7dfcc292b7 add a variable to mmi to indicate if it's of the syndicate variety as
suggested
2015-06-28 12:44:25 +01:00
Orange Borg
d8bc3acea2 Stop triggering myself when viewing fork code 2015-06-28 18:48:40 +12:00
nullquery
a6ce6abfe3 Merge pull request #8 from nullstation/master
Merge with upstream
2015-06-28 07:09:40 +02:00
barackobama
518dc0e6b4 nvm it works 2015-06-28 03:06:56 +01:00
barackobama
7aef172888 less retardation 2015-06-28 03:02:13 +01:00
barackobama
0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
Ikarrus
8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
Razharas
119c4d7929 Merge pull request #10186 from Anonus/m(i/a)crobombs
M(i/a)crobomb Adjustments
2015-06-28 00:19:06 +03:00
Ikarrus
7894263033 Destructible Clothing Tweaks
- Fixes runtime with burning decals without reagents
- Adjusts some burnable flags
- Removes minimum shred prob()
2015-06-27 13:33:33 -06:00
LaharlMontogmmery
9591d2255d Hoping this solves the merge conflict 2015-06-27 19:23:13 +02:00
Dorsisdwarf
db5a0109d6 Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine, buffs nicotine slightly. 2015-06-27 18:04:43 +01:00
Ikarrus
59ca40f03d Burning objects are processed every tick now instead of using a spawn() check 2015-06-27 09:22:14 -06:00
NullQuery
b4248b01e4 - Crew monitoring computer using the html_interface module
- Patch: Don't update html_interface clients that have been inactive for more than 10 minutes.
- Patch: Attempt to speed up _renderContent some more (in case of multiple clients) by using spawn.
- Patch: Second argument for hiIsValidClient hook: reference to the current html_interface object (used by crew monitoring computer).
- Feature: procqueue singleton. You can use this to put proc executions on a queue. Used by the crew monitoring computer to queue the update "for the next tick" when humans move.
2015-06-27 10:26:46 +02:00
Ikarrus
18098752ac Gang Tweaks
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.

- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
Ikarrus
6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Cheridan
46d7fb9bbd Merge pull request #10168 from phil235/FireaxecabinetFix
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
Cheridan
b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
phil235
ee13658752 Merge pull request #10018 from pudl/sam
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
phil235
2e61607d3f Merge pull request #10105 from xxalpha/chief
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
Anonus
a7a0d6eca7 nobody saw anything 2015-06-26 12:44:01 -04:00
Cheridan
a93c340c4f Merge pull request #10138 from spasticVerbalizer/cancelAgentID
Adds a cancel button for the agent ID dialogs
2015-06-26 10:40:15 -05:00
Anonus
c3def066c7 More obvious m(i/a)crobombs
They now have a delay based on how many were implanted.
They beep loudly for several seconds before exploding.
Overall destructive power is lower, 4/8/16 with 10 microbombs or 1 macrobomb.
If you somehow get more microbombs, then you can still get maxcap(but the delay is longer)
2015-06-26 11:37:07 -04:00
Razharas
97aaa5fb8d Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…" 2015-06-26 02:44:20 +03:00
Razharas
69d6cd4f94 Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more" 2015-06-26 02:16:02 +03:00
phil235
2aeefad94d Fixes runtime with do_after()'s that don't use a target.
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
2015-06-25 19:05:23 +02:00