Commit Graph

3320 Commits

Author SHA1 Message Date
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
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
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
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
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
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
nullquery
6453882e37 Merge pull request #10 from nullstation/master
Merge with upstream
2015-06-28 23:03:23 +02: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
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