Commit Graph

9917 Commits

Author SHA1 Message Date
Remie Richards 97504c2d0b Merge pull request #10337 from Ikarrus/beakertransferfix
Fixes Beakers unable to transfer their reagents to other objects the mob is holding
2015-07-04 17:00:07 +01:00
Ikarrus 588dcfebef More fixes and changelogs 2015-07-04 09:40:24 -06:00
Swag McYolosteinen b25767b33f Merge pull request #10335 from Ikarrus/bombcover
Fixes clothes not protecting underlaying clothes.
2015-07-04 17:24:59 +02:00
Swag McYolosteinen b649c11bc6 Merge pull request #10314 from RemieRichards/MoreAttackAnimations
More Attack Animations
2015-07-04 17:22:24 +02:00
Swag McYolosteinen 4d3d4be753 Merge pull request #10353 from Ricotez/catfix
FIX for randomly spawning with cat parts.
2015-07-04 16:58:56 +02:00
Swag McYolosteinen a4b60449f8 Merge pull request #10129 from AnturK/ayy
Abductors fixes and improvements
2015-07-04 16:57:10 +02:00
Ikarrus 38dc0890c8 Spillable var instead of checking for OPENCONTAINER as that flag encompasses a lot more than necessary. 2015-07-04 08:54:04 -06:00
Razharas bc2592eb5a Merge pull request #10222 from MMMiracles/freedomsocks
Adds patriotic apparel for upcoming 4th of July (and inferior countries too I guess)
2015-07-04 10:04:46 +03:00
Ricotez 6299b714f8 -Used Incoming's suggestion to fix the issue instead, by adding a default value to the sanitize_inlist call for tail_human and ears. 2015-07-03 20:55:26 +02:00
Ricotez f546d13c83 -Fixes pre-existing savegames randomly spawning with cat ears and/or tails.
-Fixes the new mutantparts not saving.
2015-07-03 20:18:50 +02:00
Cheridan 7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
Remie Richards 97cff6fc78 Specifies that the 3 value is for the Time argument of animate(), it was already, and did work, but due to animate() being ~funky~ it's kind of hard to read. 2015-07-03 11:50:36 +01:00
Swag McYolosteinen 1bdae57d30 Merge pull request #10313 from optimumtact/chickychickyrumba
Remove taser firing delay
2015-07-03 11:45:49 +02:00
Swag McYolosteinen d7289fd34e Merge pull request #10254 from AlexanderUlanH/saltyseclites
Shadowling Update 2: 121% Merge-Ready
2015-07-03 10:55:32 +02:00
Jordie 54c59a2b42 Merge pull request #10344 from Incoming5643/what_could_pawsibly_go_wrong
[Merge for the love of all that's decent in the world] Fixes the CATastrophe
2015-07-03 17:50:36 +10:00
Jordie d76d552285 Merge pull request #10327 from MrStonedOne/patch-18
Fixes special characters not working in asay/apm
2015-07-03 17:08:35 +10:00
Incoming 20426cc18d Fixes the catastrophe: If human mutants aren't allowed in configs they don't have to be tested for roles
Additionally the game will properly read a null feature as racially pure.
2015-07-03 03:08:11 -04:00
Razharas b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Cheridan 256f0adeb6 Merge pull request #10280 from optimumtact/securitycamerasreduxion
Remove security cameras for real
2015-07-02 22:42:50 -05:00
Ikarrus 4d1760ca74 Fixes Beakers unable to transfer their reagents to other objects the mob is holding. 2015-07-02 21:30:01 -06:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Ikarrus 8f8164d8e8 Removed atom var and instead used paramaters to determine the thrower 2015-07-02 19:57:51 -06:00
Ikarrus 91728513b6 Fixes clothes not protecting underlaying clothes.
It was because the |= operator couldn't be used to fetch the flags while the variable was null. It's set at 0 now.
2015-07-02 17:50:54 -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
Remie Richards 846d3e56c1 MINOR changes to the animation, it's now guaranteed to "smash down" into the victim, where as it was kind of random before (wtf byond?) it's also faster due maintain the same slam/smash effect. 2015-07-02 12:35:50 +01:00
Remie Richards d3e1521214 Changes the effect, the Weapon overlay now fades (to half transparency) and shifts it's pixel_z over the course of the animation. flick_overlay() now uses spawn() 2015-07-02 11:54:45 +01:00
MrStonedOne 7ba58e834b Fixes special characters not working in asay/apm 2015-07-01 20:24:52 -07: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
Ikarrus 07bf0fd953 You can splash yourself with reagent glasses now 2015-07-01 12:01:58 -06:00
xxalpha cbf041c054 MATERIAL DATUM 2015-07-01 18:32:30 +01:00
Razharas ce02df75f8 Merge pull request #10285 from Ikarrus/gangimplantmania
Gang Update: Implants Edition
2015-07-01 18:43:21 +03:00
Remie Richards 4eba0b0802 Fixes SNPCs thinking a bullet attack was a melee attack (which obviously causes issues with this system) 2015-07-01 12:43:02 +01:00
Remie Richards 9f8a4be5a0 Combat now shows an overlay of the melee weapon used. it appears on screen for 5 ticks (1/2 a second) 2015-07-01 12:00:15 +01:00
Jordie0608 3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi
2015-07-01 19:41:00 +10:00
oranges ae99453a72 Remove taser firing delay
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place

In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12:00
Swag McYolosteinen f7c7faad06 Merge pull request #10291 from RemieRichards/get_apc()-NotShitVersion
Fixes get_apc() being shit
2015-07-01 10:33:12 +02: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
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
Ricotez 79a41996f5 - Added new confic option: JOIN_WITH_MUTANT_HUMANS
- Uncommented all stuff that was commented in the last commit.
- Added a check in front of it that blocks them from showing up in the setup window if JOIN_WITH_MUTANT_HUMANS is not set.
- Included new game_options.txt as an example.

The tgstation server has never used the example game_options.txt so the new config option will not be enabled on it. Even if it did, the option starts commented out in the file.
2015-06-30 23:53:13 +02:00
phil235 782fdd7678 Merge pull request #10259 from Razharas/DemonFix
Fixes dummy objects being rightclick visible
2015-06-30 23:04:30 +02:00
Ricotez acd297e7f5 -Added new option to the VV menu drop-down list: Toggle Purrbation.
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
Cheridan 3329970b55 Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak
Tweaks space drug overdose and space drug blob effect.
2015-06-30 11:02:15 -05:00
Remie Richards d9ec8a1008 area/proc/get_apc() is no longer shit and does not lag (AT ALL) on large areas anymore, the new method stores a list of all APCs in the world, and checks if their area var is equal to the area get_apc() was called on. 2015-06-30 12:20:28 +01: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
oranges e587e0c077 Remove helmeted mounted cameras from game 2015-06-30 16:08:48 +12:00
Cheridan 3fe48e2f26 Merge pull request #10248 from optimumtact/patch-6
log simple animal attacks to attack log
2015-06-29 23:03:12 -05: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