Commit Graph

13853 Commits

Author SHA1 Message Date
Cheridan fe41766141 Merge pull request #12658 from francinum/patch-7
chainsaw is too cumbersome to carry in one hand!
2015-10-27 11:12:08 -05:00
Cheridan 7a44c8639b Merge pull request #12602 from Shadowlight213/Commtranslator
Fixes telecomms log viewer and removes unused emag_acts
2015-10-27 11:09:26 -05:00
Firecage d040083bf5 Adds the captains jetpack, both as an item and the new objective. 2015-10-27 17:34:27 +02:00
Razharas ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
Razharas fd5d7d8a75 Merge pull request #12425 from bgobandit/revbug
Hopefully fixes the heads of staff names appearing multiple times rev bug
2015-10-27 18:26:31 +03:00
Tkdrg 2b1a1f42fd Fixes chainsaws losing force when dropped
Fixes #12683
2015-10-27 11:36:55 -03:00
Firecage fc7ec2caf3 Changes jetpack objective 2015-10-27 15:13:46 +02:00
Jordie 34d4a7c15f fixes ignoring not working 2015-10-27 16:10:58 +11:00
MMMiracles 37ea3902e1 Allows eswords to embed if thrown. If you're crazy enough to throw your death stick at the guy you're trying to kill you should be rewarded for actually hitting. 2015-10-26 23:56:16 -04:00
francinum 86f5a28e73 Update twohanded.dm 2015-10-26 13:27:24 -04:00
francinum faeabc713f Makes Twohand Required pickup use wield()
Fucking Ergo.
2015-10-26 13:18:11 -04:00
francinum 659823392f You drop The Murderfucker.
the to \the
2015-10-26 12:51:28 -04:00
Razharas 3ec028fddd Merge pull request #12640 from Shadowlight213/sabrsummonfix
Fixes sabr path in summon guns
2015-10-26 12:39:13 +03:00
Razharas 3a82e0ae57 Merge pull request #12643 from tkdrg/happybirthday
Fixes extra checks for objectives
2015-10-26 12:38:53 +03:00
Cheridan 98ac2dfd9f Merge pull request #12642 from tkdrg/FUCKpaprikaNIGGER
Improves starlight performance
2015-10-26 00:35:52 -05:00
francinum 571627b501 Goddamnit. 2015-10-25 22:41:11 -04:00
francinum 0f3a6d11c3 You drop the chainsaw. 2015-10-25 22:40:02 -04:00
Incoming 5a4d72f5a4 *Supermatter sword will now passively eat through anything you put it in, and burn through the floor it's resting on!
*Supermatter sword now laughs at explosions and acid!
2015-10-25 22:08:22 -04:00
francinum 44f3e23bf0 chainsaw is too cumbersome to carry in one hand! 2015-10-25 22:01:30 -04:00
Razharas 48e2383b40 Merge pull request #12623 from RemieRichards/FatalMeme
Ghost Camera!
2015-10-26 03:25:29 +03:00
Razharas 5e2d647f63 Merge pull request #12626 from MrPerson/detag_clinic
Remove tags from some maps
2015-10-26 03:21:03 +03:00
Razharas 79e03eca89 Merge pull request #12633 from tkdrg/walkingonair
Improves performance of set_airlock_overlays
2015-10-26 03:14:18 +03:00
Razharas 4a5edd6498 Merge pull request #12638 from SuperSayu/jobs_txt
Should fix loading from jobs.txt
2015-10-26 03:08:07 +03:00
Remie Richards 2e7cb827f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into CameraObscura
Conflicts:
	code/modules/crafting/recipes.dm
2015-10-26 00:04:36 +00:00
Razharas 67d21eb1f0 Merge pull request #12622 from KorPhaeron/blobfix
Fixes blob spore exploit
2015-10-26 03:03:02 +03:00
Razharas 145a2dd9e9 Merge pull request #12631 from AnturK/beam
Beam Code Cleanup
2015-10-26 03:02:41 +03:00
Razharas 4e44e8f4ae Merge pull request #12632 from tkdrg/thanksaran
Stops fire alarms from triggering every tick
2015-10-26 03:02:15 +03:00
Razharas 2063d3fe93 Merge pull request #12608 from Fox-McCloud/spacesuit-slowdown
Lowers the Spacesuit Slowdown from 2 to 1
2015-10-26 02:53:39 +03:00
Remie Richards b99ecdfbe0 Merge pull request #12597 from AnturK/atoningmycodingsins
Action Button Minor Rework Cleanup
2015-10-25 23:02:59 +00:00
as334 f116ba5c32 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-10-25 15:39:42 -04:00
Cheridan ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Remie Richards fa75581074 Merge pull request #12586 from Jordie0608/thisprnotinspiredbyanymemberofthecommunityhonest
Selective ooc muting
2015-10-25 19:11:21 +00:00
Cheridan a53d35e00c Merge pull request #12548 from tkdrg/ilive_again
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Cheridan 10b82ee45b Merge pull request #12304 from Incoming5643/utility_aint_gonna_cut_it
Adding Charge and Staff of Healing to the spellbook + category reshuffle
2015-10-25 05:23:03 -05:00
Cheridan b10368c3e3 Merge pull request #12306 from Incoming5643/RTD
Adds d1 and d100 dice
2015-10-25 05:19:17 -05:00
Cheridan 0f3c83b250 Merge pull request #12601 from KorPhaeron/burn
No access restrictions on crematorium button
2015-10-25 05:08:49 -05:00
Shadowlight213 f52bb39674 Adds OOC banning 2015-10-25 00:45:48 -07:00
Incoming ef24943bc9 SUPERMATTER SWORD!
It's a sword made of supermatter! It'll dust nearly anything! It's hilariously lethal to actually attack with without radiation shielding! It's still eventually lethal even WITH radiation shielding! Admin Only! Good Ideas!
2015-10-25 03:15:07 -04:00
Tkdrg 7fc81c0ea4 Fixes extra checks for objectives
Fixes #4725
Reopens #11444 @Dorsisdwarf
@Cheridan please.
2015-10-25 02:57:07 -03:00
Tkdrg c2093e3709 Improves starlight performance
Still laggy, but now quite a bit better.
Fixes #8154
2015-10-25 01:55:04 -03:00
Incoming5643 c4af09089c no comment 2015-10-24 23:44:22 -04:00
Incoming 5b3215a6d7 @memo incoming wow making sure you update to master sure is hard huh? 2015-10-24 23:43:26 -04:00
Incoming ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies
Conflicts:
	code/game/machinery/computer/shuttle.dm
2015-10-24 23:32:55 -04:00
Shadowlight213 4b4a658352 Fixes sabr path in summon guns 2015-10-24 19:14:00 -07:00
Vincent 3e6f641ec3 Should fix loading from jobs.txt
The jobs controller's list of occupations was reset during roundstart which completely undid that whole load from file thing.  It also would have undone any admin edits done while sitting in the lobby.

Also fixed a couple instances where people thought that lists get copied with the = operator instead of passing by reference.
2015-10-24 19:46:44 -04:00
Tkdrg 29f42778dd Improves performance of set_airlock_overlays
They will now only update when they actually change. On my testing, this
made performance improve about 3-15 times, depending on the use case.

I could have made this a loop if I turned the overlays into a list with
defines but I was lazy and this copy-paste is probably slightly faster
than a list as well (despite being harder to read and to maintain).
2015-10-24 13:55:58 -03:00
MrPerson 73c0f5d462 Remove tags from some maps
Disc was left completely untouched. Dream was given only a single edit to keep the syndiebomb working. Meta and Bird are also both cleaned up now too. All map-specific custom z's were cleaned too.

Source of these tags is DM being stupid. When you use the "Generate instances based on icon states" option, for some ungodly reason it gives those instances a tag. Which is retarded, tags are supposed to be unique to each object.

I tried searching for legit uses of tag in code and found only a few landmarks and giving mobs a tag. In any event, setting tags on map objects is probably a really bad idea anyway.

Exact regex used to find these so you guys can check my work

; tag = "[^"]*"
#end/middle

(?<=\{)tag = "[^"]*";
#begin

\{tag = "[^"]*"\}
#solo
2015-10-24 09:07:32 -07:00
Tkdrg 10dae485bc Stops fire alarms from triggering every tick
This was triggering fire alarms every tick whenever there was a fire,
which lagged quite a bit. Thanks to Aranclanos for pointing it out.
2015-10-24 12:55:30 -03:00
AnturK a172ad841b Beam Code Cleanup 2015-10-24 14:03:30 +02:00
KorPhaeron eb37baeb64 Cleanup, beams only 2015-10-24 06:44:31 -05:00