38bae5f833
Fixes arrivals shuttle getting destroyed breaking observing.
2015-10-26 05:31:16 -07:00
4f652da4bd
Adds a config option for the round end restart delay.
...
This should enable more murder death kill at round end before the next round starts.
New servers will default to 90 seconds while old servers will default to the old 25 seconds until they import the config option to their server.
2015-10-26 05:04:43 -07:00
3ec028fddd
Merge pull request #12640 from Shadowlight213/sabrsummonfix
...
Fixes sabr path in summon guns
2015-10-26 12:39:13 +03:00
3a82e0ae57
Merge pull request #12643 from tkdrg/happybirthday
...
Fixes extra checks for objectives
2015-10-26 12:38:53 +03:00
a1c5385e38
Re-adds ranged block
2015-10-26 00:54:22 -07:00
f11b9ef0a4
Removes melee syndicate block chance as it was snowflake and buggy, and increased their health to compensate.
2015-10-26 00:29:28 -07:00
1691675e9a
Fixes wizarditis runtime
2015-10-25 23:50:07 -07:00
8e775a18ff
Adds a ghost on-screen HUD
...
Removes the ghost verbs and adds an on-screen HUD.
2015-10-26 03:22:29 -03:00
98ac2dfd9f
Merge pull request #12642 from tkdrg/FUCKpaprikaNIGGER
...
Improves starlight performance
2015-10-26 00:35:52 -05:00
7de9f6cc68
Clean
2015-10-25 23:54:51 -05:00
49dfb52cea
Parasites
2015-10-25 21:42:47 -05:00
571627b501
Goddamnit.
2015-10-25 22:41:11 -04:00
0f3a6d11c3
You drop the chainsaw.
2015-10-25 22:40:02 -04:00
234c3b76fb
Player Parrots can now sit on Human's shoulders.
2015-10-26 02:33:44 +00:00
6b0ecfed4b
Buffs cats. Cats can now ventcrawl, walk over tables, take less damage from lacking air(and will thus survive longer in boxes with radiation) and can live in slightly higher and lower temperatures.
2015-10-25 22:16:25 -04:00
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
44f3e23bf0
chainsaw is too cumbersome to carry in one hand!
2015-10-25 22:01:30 -04:00
bf8cdc2896
Merge pull request #12627 from tkdrg/admin_antag_HUD
...
Adds Admin-only Antag HUDs
2015-10-26 03:57:07 +03:00
e71bc1f214
Merge pull request #12598 from Incoming5643/ok_it_was_OP_I_admit_it
...
Lichmode nerfs
2015-10-26 03:47:15 +03:00
48e2383b40
Merge pull request #12623 from RemieRichards/FatalMeme
...
Ghost Camera!
2015-10-26 03:25:29 +03:00
76f198a3f6
Runtime
2015-10-25 19:25:07 -05:00
2a075688d8
Merge pull request #12566 from AnturK/isitaplane
...
Makes is_type helpers inline
2015-10-26 03:22:42 +03:00
5e2d647f63
Merge pull request #12626 from MrPerson/detag_clinic
...
Remove tags from some maps
2015-10-26 03:21:03 +03:00
14fb361c82
Merge remote-tracking branch 'upstream/master' into chronosuit_phase_better
2015-10-25 20:14:41 -04:00
79e03eca89
Merge pull request #12633 from tkdrg/walkingonair
...
Improves performance of set_airlock_overlays
2015-10-26 03:14:18 +03:00
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
4a5edd6498
Merge pull request #12638 from SuperSayu/jobs_txt
...
Should fix loading from jobs.txt
2015-10-26 03:08:07 +03:00
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
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
67d21eb1f0
Merge pull request #12622 from KorPhaeron/blobfix
...
Fixes blob spore exploit
2015-10-26 03:03:02 +03:00
145a2dd9e9
Merge pull request #12631 from AnturK/beam
...
Beam Code Cleanup
2015-10-26 03:02:41 +03:00
4e44e8f4ae
Merge pull request #12632 from tkdrg/thanksaran
...
Stops fire alarms from triggering every tick
2015-10-26 03:02:15 +03:00
67e1620873
Merge pull request #12610 from RemieRichards/NeoIsTheOne
...
Per mob "Reaction Times"
2015-10-26 03:00:28 +03:00
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
ea9f21a5e3
Merge pull request #12619 from Robustin/master
...
Brings balance to the universe (Pest Spray nerf)
2015-10-26 02:50:49 +03:00
b99ecdfbe0
Merge pull request #12597 from AnturK/atoningmycodingsins
...
Action Button Minor Rework Cleanup
2015-10-25 23:02:59 +00:00
2c3f54cc2e
Xenobio fix
2015-10-25 17:59:05 -05:00
9e96641f53
Merge pull request #12543 from AnturK/screenlocstuff
...
Action button screenloc cleanup
2015-10-25 22:55:13 +00:00
de67be73af
Turf check
2015-10-25 17:51:38 -05:00
d594ed34d6
[readding the heat/cold modifiers]
2015-10-25 16:54:57 -04:00
aad61cb567
Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live
...
Conflicts:
code/modules/mob/living/carbon/human/species_types.dm
2015-10-25 16:51:25 -04:00
f5601b2b4f
Wake me up inside(Fixes small compile issue)
2015-10-25 15:57:07 -04:00
f116ba5c32
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-10-25 15:39:42 -04:00
ed9b0c35c6
Merge pull request #12612 from phil235/BugFixBoogalooI
...
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
fa75581074
Merge pull request #12586 from Jordie0608/thisprnotinspiredbyanymemberofthecommunityhonest
...
Selective ooc muting
2015-10-25 19:11:21 +00:00
202eefe635
Fixes the compile issue, adds myself to admin.txt
2015-10-25 14:45:18 -04:00
0ce740fa94
Fixes dropable bloodcrawl hands, you need both of these when the item is something you keep in your hands.
2015-10-25 14:39:59 -04:00
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
a53d35e00c
Merge pull request #12548 from tkdrg/ilive_again
...
Adds Chainsaws
2015-10-25 13:09:55 -05:00
66d2e28e3a
Adds googly eyes for animated mimics
...
The eyes also follow their targets.
Fixes #3522
2015-10-25 14:35:19 -03:00
Kyle Spier-Swenson
Razharas
Shadowlight213
Tkdrg
Cheridan
KorPhaeron
francinum
Remie Richards
Nerd Lord
Incoming
JJRcop
as334