Commit Graph

9957 Commits

Author SHA1 Message Date
Cheridan c286b1710d Merge pull request #10360 from Perakp/cargoVirusEvent
New shuttle loan event + fixes
2015-07-07 07:42:08 -05:00
Cheridan 54754c52a9 Merge pull request #10407 from nullstation/hi-extended-patch
Improvements to crew monitoring computer
2015-07-07 07:12:08 -05:00
Remie Richards 1fe4aee65e Merge pull request #10415 from Ikarrus/lizardnames
Random Names for Lizards
2015-07-07 03:24:55 +01:00
Ikarrus b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
phil235 1218d8a9f6 Merge pull request #10292 from spasticVerbalizer/disposalSanityCheck
Adds sanity check to disposal climbing
2015-07-06 19:25:43 +02:00
Ikarrus 5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus b0cfaf401f Random Names for Lizards
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
Remie Richards 513b589d80 Merge pull request #10389 from Razharas/PinFix
Fixes pin removal having no category
2015-07-06 00:31:43 +01:00
Razharas 126b9e1b10 Merge pull request #10329 from RemieRichards/FixToolTextTablecraft
Fixes Tablecraft Tool Spam
2015-07-05 23:17:59 +03:00
NullQuery 10109d134f - Fixes sorting on the crew monitoring computer. Items will now sort as they have before, based on the department and job.
- Hovering over a dot on the map will now scroll to the applicable person in the table.
- Patch for interactive mobs (sNPCs) to properly set assignments on their ID's.
2015-07-05 13:15:20 +02:00
Razharas 3cf25b4be0 Fixes pin removal having no category 2015-07-05 01:38:40 +03:00
Razharas 6fad4d1df8 Merge pull request #10271 from Cheridan/red_faction
Removes Access Restriction on Mining Shuttle Console
2015-07-05 00:21:58 +03:00
Cheridan e4a3372a7f Merge pull request #10257 from Razharas/ChamFix
Fixes chameleon mutation
2015-07-04 16:08:17 -05:00
Cheridan 13d0fcc9e9 Merge pull request #10261 from Razharas/FridgeFix
Fixes smartfridge construction and deconstruction
2015-07-04 15:42:35 -05:00
Razharas 60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Perakp b1196d89fb - Readded the department resupply event and the supply crates for the other events. 2015-07-04 21:30:20 +03:00
Cheridan 96ff8ab617 Merge pull request #10265 from Razharas/PinRemoval
Added pin removal recipe
2015-07-04 12:50:11 -05:00
Cheridan 798f05e4a6 Merge pull request #10272 from Razharas/DarkClick
Fixes clicks in darkness
2015-07-04 12:17:10 -05:00
Cheridan c9c2e90acb Merge pull request #10268 from GunHog/Ore_ID
Ore Redemption Machine ID improvement
2015-07-04 12:10:56 -05:00
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
Perakp 2b534cf5aa - Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.
- Removes supply order crates from shuttle loan events. These were pretty unintuitive, as you needed to accept the crates separately.
- Adds a new shuttle loan event: Centcom wants you to help in a virus research program. I feel this is a more controlled way of bringing diseases on the station compared to the disease outbreak event.
- Fixes camera failure event
- Fixes spanish flu, adds spanish flu culture bottle
2015-07-04 01:46:50 +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 2c899c84ab Fixes an indentation error that causes "Tools: X" to repeat in Tablecrafting. 2015-07-02 17:33:11 +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