Commit Graph

3171 Commits

Author SHA1 Message Date
Leo fb366a6d22 Merge pull request #28613 from ohnopigeons/youregonnacarrythatweight
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy
2017-06-20 20:00:49 -03:00
Jordan Brown 50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Jordan Brown 59a3865f60 Merge pull request #28600 from ChangelingRain/hiddenripley
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 13:08:48 -04:00
kevinz000 d1108df80c [READY] The Portal Update - Linked portals, momentum conservation, and more! (#28055)
* THE PORTAL UPDATE

* portal gun checks

* damn functions

* o_range(s)

* Atmos Portals (#12)

* Rod Form's damage now scales with how much it's upgraded

* buffs chem grenades

* Fix getrev runtime

* Automatic changelog generation for PR #27948 [ci skip]

* Automatic changelog generation for PR #27951 [ci skip]

* Fixes admiral recall (#27861)

* the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978)

* Beam rifles now slowdown while scoped (#27898)

* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm

* Fixes a very silly clockwork false wall trick (#27996)

* Fixes #27979 (#28002)

* Automatic changelog generation for PR #28002 [ci skip]

* Fixes #27989 : Riot suits no longer hide jumpsuits (#28003)

* Fixes #27989

* remove tag

* Automatic changelog generation for PR #28003 [ci skip]

* Refactors a cooldown var to not require a spawn or sleep (#28011)

* wat (#28012)

* Remove spawns in favour of stacktrace calls, which don't stop the called (#28013)

proc

* Refactor another spawned cooldown var (#28014)

* Come on, pathetic (#28015)

* Refactor another spawn cooldown (#28016)

* Goodbye spawn (#28017)

* Another spawn timer (#28018)

* Remove a commented out function (#28019)

* Gotta go with the fro2.0 (#28010)

* This doesn't do anything (#28020)

* refactor another spawn cooldown (#28022)

* Refactors another spawn cooldown var (#28023)

* Refactor another spawn (#28024)

* Refactor another spawn var (#28027)

* woops

* woops2

* atmos links!

* unused

* wew

* ffs!

* Forced updates

* update

* Update portals.dm

* adjacent/atmospass checks

* Create portals.dm

* Update portals.dm

* Update other_tools.dm

* stuff

* crossed

* documentation

* reee

* no portal stacking!

* woops
2017-06-20 11:02:01 -04:00
Jordan Brown 1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges 186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
Pigeons ccbe27f977 Removes pull check in Process-Spacemove in riding datum 2017-06-19 16:54:25 -04:00
Joan Lung 563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
Joan Lung 0fd7b8b842 Adds a heavily-damaged ripley as a ruin 2017-06-19 12:28:29 -04:00
Joan Lung 2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Jordan Brown e1f9fe6b99 Fixes testmerge display (#28513) 2017-06-17 16:44:07 -03:00
Leo eaaf16536a Merge pull request #28510 from tgstation/RemieRichards-passenger_dirs
Allows fine control over rider/passenger direction in vehicles
2017-06-17 09:33:41 -03:00
Mike Long 3ddef57ecf Vomit fix (#28492) 2017-06-16 17:18:19 -03:00
Joan Lung 56337d7252 Cultists must be human to run for Cult Master status (#28473) 2017-06-16 14:53:15 -03:00
Remie Richards 995c5cf145 Allows fine control over rider/passenger direction in vehicles
+ Fixes rider dirs not being set at all.
2017-06-16 10:19:42 +01:00
Jordan Brown 6aeaf4564a Fixes a documentation typo 2017-06-14 12:41:02 -04:00
Joan Lung 3315c4c311 People converted to clockcult will actually have their world turn yellow briefly, matching the messages (#28397) 2017-06-13 21:47:29 -03:00
Lzimann 3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
ShizCalev 1bb0b2dd07 fixes (#28245)
fixes #13303
2017-06-10 19:18:33 +02:00
Robustin 7f4c778890 Cyberboss suggestions to the old code too 2017-06-09 17:53:45 -04:00
Robustin 457d747b03 Summon fix 2017-06-09 14:20:05 -04:00
Joan Lung 19f7169630 Merge pull request #28165 from Tacolizard/medalaf
Adds Medal Commendations!
2017-06-08 21:38:38 -04:00
Tacolizard ecbae6560a WARNING 2017-06-08 15:21:55 -07:00
Jordan Brown 9fa9c8c6a7 Diseases can now only spread to mobs with an atmos line of sight (#28197) 2017-06-08 19:17:27 -03:00
Jordan Brown 23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
kevinz000 596ef51039 Merge remote-tracking branch 'tgstation/master' into gang_points_refactor 2017-06-08 11:05:12 -07:00
Jordan Brown f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Jordan Brown b6538c50e2 Fixes, css, removes changefont 2017-06-08 12:52:25 -04:00
Jordan Brown ad4e8d5ceb Sanity check open 2017-06-08 12:17:18 -04:00
Jordan Brown d5ed64f005 Fixes the bug!!!! 2017-06-08 12:11:01 -04:00
Tacolizard 4997327326 remiefix 2017-06-08 09:08:54 -07:00
Robustin b409a52d42 Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)
* Restricted Blood Cult Summoning

* fixed warning
2017-06-08 07:28:40 -04:00
Joan Lung 11bf285c16 Merge pull request #28199 from Cyberboss/MenuFix
Fixes datum verbs
2017-06-07 21:06:49 -04:00
Joan Lung 45c5e0b1d0 Merge pull request #28156 from 4dplanner/antaghud
Fixes traitors not showing up on antagHUD
2017-06-07 20:26:43 -04:00
Jordan Brown 5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Tacolizard 954c3a7abd refactor outfit datum 2017-06-07 13:47:31 -07:00
Jordan Brown 1a1f1b5db5 Fax 2017-06-07 16:10:16 -04:00
Jordan Brown 3073d0dc8c Fixes datum verbs 2017-06-07 16:08:52 -04:00
Jordan Brown e6bfb7f449 Refactors datum verbs to be general (#28109) 2017-06-06 22:21:26 -03:00
4DPlanner eaf15a41f4 Calls super 2017-06-06 22:21:09 +01:00
kevinz000 703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
Jordan Brown 75007ece1b Hang up holocalls with an action (#28100) 2017-06-06 12:34:10 -03:00
Jordan Brown 8ce7cd9afd Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 11:13:16 -04:00
Joan Lung 35e92b25d3 Merge pull request #28097 from Cyberboss/WhyAreYouUsingSafeMode
Removes safe mode prompts
2017-06-06 11:07:03 -04:00
Jordan Brown ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Robustin af34882816 Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#27722)
* funMaster

* now teleports + telegraphs

* Update cult_comms.dm

* Delta REEEEE

* Done but still needs a couple more touches

* Update cult_comms.dm

* Finished & 150 hours tested

* Reworded

* plz dont break

* ok
2017-06-06 11:06:08 +02:00
4DPlanner c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely
have no idea how this was a merge conflict and also fixes paren
2017-06-06 02:49:04 +01:00
4DPlanner 8a01762a75 Similar changes 2017-06-06 02:40:30 +01:00
4DPlanner dd9c858c3b Pidey recommended changes 2017-06-06 02:37:07 +01:00
Joan Lung 180dd7bd84 Adds another unique KA mod to necropolis chests (#27982) 2017-06-05 14:52:03 -03:00