Commit Graph

2970 Commits

Author SHA1 Message Date
phil235
c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
Cheridan
6bce2db70d Merge pull request #9159 from Ikarrus/gang5
Gang Update 5
2015-04-26 14:29:50 -05:00
Ikarrus
a46d79245c Squashed commits. You can see what they do in the first commit/PR desc 2015-04-25 14:05:30 -06:00
phil235
2ef588e01d derp 2015-04-25 19:27:20 +02:00
phil235
67a14f4c21 Changed how the bible icon is chosen, it's now done manually by clicking the bible as a chaplain (only work once). 2015-04-25 19:21:32 +02:00
Ikarrus
e26695b7db Removed unnecessary check 2015-04-25 02:36:59 -06:00
Ikarrus
452bae9c19 - Capture goal reduced to 60%
- You must be in the territory physically to tag it now. So no more tagging everything from maint.
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.

- Removed solars and shuttles, and the toxins test chamber from valid territory list
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.
- You cannot tag tiles with APCs. No cheating, you maint crawlers.
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing them
2015-04-25 02:14:28 -06:00
Ikarrus
7b02a11dc2 Gang Update 5
###Major Changes###
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.

###Minor Changes###
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing people
2015-04-25 01:20:04 -06:00
Boggart
077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
Boggart
c6a22a98c9 Renames Violin.dm to Instruments.dm in preparation for generalizing the code and to preserve the git history. 2015-04-24 19:12:16 -06:00
kingofkosmos
d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
kingofkosmos
761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Cheridan
30d160b1d2 Merge pull request #9112 from Ikarrus/gang4
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
Swag McYolosteinen
983e306f23 Merge pull request #9069 from Boggart/allowdisposalpipesonwalls
Fixes being unable to construct disposal pipes on walls, an RPD bug and moves it over to the datum/browser ui.
2015-04-23 20:26:16 +02:00
Boggart
ecebb594f9 Fixes being unable to construct disposal pipes on walls and fixes changing the RPD settings while already building affecting the currently building pipes.
Changes the RPD to use the newer datum/browser ui, makes it so that it show's what you have picked and doesn't let you endlessly repick it.

Fixes my wonky check for bins/outlets/chutes on walls, also adds a changelog.

Undefs the defines in RPD.dm at the end of the file.

Changes the "Type:" label to "Category:"
2015-04-23 11:53:27 -06:00
Ikarrus
d420e3f467 Pistols -> 25 Cost 2015-04-23 09:23:27 -06:00
Ikarrus
d97268f24b Fixed switchblade hitsound not starting in its retracted state 2015-04-22 21:13:14 -06:00
Ikarrus
1a1b906eec - Switchblade changes hitsounds now if it's not extended.
- Reverted the boss icon back to use a B. I changed it for a different idea I had but I never went through with it but I forgot to change the icon back
- Price tweaks
2015-04-22 20:02:50 -06:00
phil235
f23db26b6a Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02:00
kingofkosmos
d54509c23f Fix for watertank toggling while buckled. 2015-04-22 18:17:35 +03:00
Ikarrus
e811eac22e Resolve Conflicts:
icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi
2015-04-22 08:14:05 -06:00
Ikarrus
2343579a48 - Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round
- Increased pen cooldown to (15*Gang size)+45 seconds
- Promotion cost now counts how many times you bought that item instead of how many bosses you have, so you can't stockpile on cheap gangtools before promoting anyone
2015-04-22 08:08:13 -06:00
Jordie
ea9b15780c Merge pull request #9086 from phil235/BundleFix3
bodytemperature and other fixes
2015-04-22 17:50:39 +10:00
Ikarrus
120cb22cb4 Added a changelog and additional tweaks 2015-04-22 00:01:57 -06:00
Ikarrus
c771d30986 Gang Mode Update 4
**Major Changes**
- Increased win condition to require 66%
- Added a switchblade. A relatively cheap and decently robust melee weapon for gangsters.
- Capped how much influence you can get every income at 50
- Limited gang spraycan use to 15
- Pistol cost increased to 30 Influence
- Promotion cost now scales to how many bosses you already have. The more bosses, the more expensive it will be. It starts off cheap at 20 influence now.

**Minor Changes**
- Tagging a territory now tells you what territory you actually tagged!
- Added an option to silence the verbose territorial updates you get from gangtools
- Capped how much influence you can get every income at 50
- Updated Centcom report on gangs
- Spraycans always show their inhands now, instead of only when uncapped
- Antag panel now shows how much influence each gang has
- Cleaned up gang code in the traitor panel
- Fixed non-gangers getting gang messages when trying to spray on an invalid territory
2015-04-21 23:23:15 -06:00
Swag McYolosteinen
0e9f2695b1 Merge pull request #9080 from Ikarrus/gangtweaks3
Gang mode changelog and minute tweaks
2015-04-21 17:10:14 +02:00
Swag McYolosteinen
dc696c16cc Merge pull request #9028 from Fayrik/CentcomExpansion
Centcom change, Deathsquad buff and Abductors get the new advanced camera console.
2015-04-20 19:03:04 +02:00
phil235
658a73d3e8 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix3
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
2015-04-20 18:44:04 +02:00
phil235
fc158ef7bd - crate mimic have wrong icon var. 8953
- fixes constructable chem master icon when parts are exchanged. 8616
- lowers toolboxes inhands sprite, fixes missing one. 8433
- fixes exploit in pandemic to avoid the bottle creation cooldown. 8031
- fixes chem grenade not getting to southwest side. 8019
- remove handle_env, /handle_random_events() and handle_blood at carbon level, identical to living level.
- fixes human bodytemp dropping to 20C in normal environment. (32.5C 90.5F when naked now)
- you now need both adequate headgear+suit to protect against pressure. (removing two defines)
- fixes alien hunter being immune to env fire in stalk mode (removing hunter/handle_env())
- fixes monkey not metabolizing reagents, also make larva metabolize them. 7108
- remove calculate_affecting_pressure from monkey level, simplification.
- refactors monkey's handle environment, no more handle_temp_damage proc, it's all in handle_env.Fixes temperature alert not showing for monkey.
- refactor monkey/handle_fire (similar to alien/human now.)
- replaces morphine with stimulants in adrenal implant. 8832
- refactor handle_breath_temperature.
2015-04-20 18:15:06 +02:00
kingofkosmos
e878ca4c8c Fixes #9071 2015-04-20 19:12:27 +03:00
Ikarrus
9c10cec883 Gang mode changelog and minute tweaks
- Gang mode changelog
- Recruitment doesn't cause an obvious seizure any more
- Removed reduced usage on territory spraycans
- Spraycans will notify you if the area you are spraying at is not a valid one for tagging
2015-04-20 08:31:19 -06:00
Ikarrus
4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26:15 -06:00
Ikarrus
af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
Fayrik
558f46af1e Forgot the encryption key sprite. 2015-04-18 00:41:15 +01:00
Fayrik
84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Jordie
4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Jordie
210eedbb48 Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
Cheridan
87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Swag McYolosteinen
36cac2405d Merge pull request #8932 from Iamgoofball/patch-56
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Cheridan
26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
phil235
2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
phil235
081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Xhuis
87541dabc2 Progress 2015-04-13 19:12:29 -04:00