Commit Graph

20350 Commits

Author SHA1 Message Date
Remie Richards 234c3b76fb Player Parrots can now sit on Human's shoulders. 2015-10-26 02:33:44 +00:00
Razharas bf8cdc2896 Merge pull request #12627 from tkdrg/admin_antag_HUD
Adds Admin-only Antag HUDs
2015-10-26 03:57:07 +03:00
Razharas e71bc1f214 Merge pull request #12598 from Incoming5643/ok_it_was_OP_I_admit_it
Lichmode nerfs
2015-10-26 03:47:15 +03:00
Razharas 48e2383b40 Merge pull request #12623 from RemieRichards/FatalMeme
Ghost Camera!
2015-10-26 03:25:29 +03:00
Razharas 2a075688d8 Merge pull request #12566 from AnturK/isitaplane
Makes is_type helpers inline
2015-10-26 03:22:42 +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
Remie Richards c51d719dd9 Merge pull request #12618 from blobbernaut/Blobbernaut
Fixes cloaks; Allows more item slots to have armor (such as shoes and gloves)
2015-10-26 00:11:13 +00: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 5c94edc8f6 Merge pull request #12441 from xxalpha/swiss_cheese
Adds a very small chance of mice chewing power cables.
2015-10-26 03:04:23 +03: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 67e1620873 Merge pull request #12610 from RemieRichards/NeoIsTheOne
Per mob "Reaction Times"
2015-10-26 03:00:28 +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
Razharas ea9f21a5e3 Merge pull request #12619 from Robustin/master
Brings balance to the universe (Pest Spray nerf)
2015-10-26 02:50:49 +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
Remie Richards 9e96641f53 Merge pull request #12543 from AnturK/screenlocstuff
Action button screenloc cleanup
2015-10-25 22:55:13 +00: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
Incoming 1a199fa567 Sets up a catch for the lich spell's needed immunity to instantly ending the round on wizard death so it will still end the round once the wizard's body is properly disposed of. 2015-10-25 14:23:30 -04: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
blobbernaut 57eae7d70d Update cloaks.dm 2015-10-24 21:37:13 -04:00
blobbernaut e046023a21 Update cloaks.dm 2015-10-24 21:35:27 -04:00
Vincent de68ad1085 Security officer scaling is altered.
Previously, security officer scaling was between 5-12 no matter what was configured.
Now, security officers will have (spawn positions)-12 spawn and total position slots.
This can be set in jobs.txt or admin set through the jobs controller while in the lobby.
This is only used when officer scaling is set.

Also, the number of extra security equipment closets spawned is relative to the number of total job positions configured, with or without officer scaling.  Previously if officer scaling was not set, no additional closets could spawn.

Adds myself to admins.txt after like 3 years of contributing
2015-10-24 21:05:06 -04: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
blobbernaut ac5c67d2a8 Update human_defense.dm 2015-10-24 13:26: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
blobbernaut 66d724a9b3 Update human_defense.dm 2015-10-24 03:50:44 -04:00
blobbernaut 32641c20fd Update human_defense.dm 2015-10-24 03:29:56 -04:00
blobbernaut c8030a274c Update human_defense.dm 2015-10-24 03:28:09 -04:00
blobbernaut 7e1f9b1409 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Blobbernaut 2015-10-24 03:26:34 -04:00
Tkdrg 35d09e7cc0 Adds Admin-only Antag HUDs
Togglable by a verb in the Admin tab. Only Rev, Cult, Ops and Shadowling
atm because the others don't have huds/have more than one hud and I'm
too lazy to handle it properly here. Also adds a debug verb for huds.
2015-10-24 02:53:38 -03:00
Razharas fc4efa78c3 Merge pull request #12479 from octareenroon91/patch-27
Area Name Propriety
2015-10-24 03:16:27 +03:00
Razharas eeef634a35 Merge pull request #12505 from phil235/AlcoholTweak
Changed the effects of alcohol to be more realistic.
2015-10-24 03:15:55 +03:00
Razharas a837494646 Merge pull request #12542 from KorPhaeron/xenobio
Gold slime extract buff
2015-10-24 03:14:59 +03:00
Remie Richards d524b4acde Adds a special camera that can see ghosts (if the ghost is orbiting something they are skipped, this is to prevent it being used for power/meta gaming) the Chaplain spawns with one and they can be tablecrafted using a camera and holywater 2015-10-24 00:53:36 +01:00
Razharas 7763eed114 Merge pull request #12621 from tgstation/RemieRichards-DroneInhandFix
Fixes drone inhands all being on the right
2015-10-24 02:50:31 +03:00
Razharas 5b0626970c Merge pull request #12572 from KorPhaeron/sharp
Makes changeling armblades sharp
2015-10-24 02:48:16 +03:00
KorPhaeron 9c482231fb Blobfix 2015-10-23 18:40:44 -05:00
Remie Richards c164e41a21 Fixes drone inhands all being on the right 2015-10-24 00:39:19 +01:00
Robustin 2f48487df3 Update hydroitemdefines.dm 2015-10-23 17:29:51 -04:00
Robustin 0664761bab Update hydroitemdefines.dm 2015-10-23 17:28:42 -04:00