Commit Graph

1040 Commits

Author SHA1 Message Date
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Jordan Brown
bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
Fox McCloud
2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
oranges
e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
oranges
5494f5328a Rename Bump to Collide (#29207)
This reduces confusion arising from the fact byond already has a built
in byond proc also named Bump.

We used an argument called yes to distinguish our Bump from byond's
builtin bump, but then we failed to make sure everyone of our bumps
properly override it, so a bunch of things have been double bumping

This resolves that issue permanently

I've also removed the second argument as it no longer has a purpose

I also cleaned up the recycler bump as it didn't do anything the
parent procs didn't already do
2017-07-14 13:47:22 +02:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000
7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Leo
a43ba99207 Merge pull request #29061 from ChangelingRain/warpeffect
Warp cubes are slightly less instant but way cooler
2017-07-06 22:12:21 -03:00
Joan Lung
bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
Joan Lung
f6c1d03805 Warp cubes are slightly less instant but way cooler 2017-07-05 18:02:05 -04:00
kevinz000
62ad647495 Fixes portals not autosetting their overridden target turf on Initialize - "It actually was my fault" (#28999)
* Update portals.dm

* Update portals.dm
2017-07-05 10:36:02 -04:00
Joan Lung
a110e881ad Adds the blood-drunk miner as a potential mining "mini" boss (#28829) 2017-06-30 22:39:49 -03:00
kevinz000
712428ec9c Allows adminspawning of portals (#28896) 2017-06-29 00:53:58 -04:00
Ergovisavi
a08aa9e3a2 Fixes resin stacking & allows lasers to pass through resin (#28842)
* Fixes resin stacking
Lets you shoot through Resin with lasers!

* Small code cleanup

* TRUE
2017-06-27 09:29:26 -04:00
Jordan Brown
e9a66eb6ec Fixes resin attack message (#28789) 2017-06-26 13:02:52 +02:00
Joan Lung
601ad4beda Adds the Cleaving Saw as what will be the reward for killing a miniboss (#28565)
* Adds the Cleaving Saw as what will be a reward for killing a miniboss

* slashslice

* wowduh

* some tweaks

* bleed!

* a little slower

* Smaller cleave, higher damage

* more info

* saw icon

* It's finally dooooone!

* done
2017-06-25 12:49:32 -04:00
Joan Lung
deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown
2a35e1c2ac Merge pull request #28588 from Ergovisavi/atmos_backpack_again
Changes to the Atmos Watertank Backpack
2017-06-20 21:49:02 -04:00
Ergovisavi
e1bdd83020 Changes the holo-fan to the holo-firelock, other minor changes and fixes 2017-06-20 18:36:45 -07: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
6440a70ec2 Merge pull request #28605 from ChangelingRain/slipfix
Fixes slips
2017-06-20 15:49:45 -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
Joan Lung
38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
Joan Lung
563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
Ergovisavi
9f30277c2d Take two at making ATMOS actually capable of fixing ATMOS in a timely manner 2017-06-19 00:24:01 -07: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
af13f405bd Fixes bloody footprints runtime (#28372) 2017-06-13 09:47:40 +02:00
Jordan Brown
652d7b6ade Fixes decal initialize errors (#28370) 2017-06-13 09:45:29 +02:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
ShizCalev
d46b1f7a09 Fixes basic spiderlings becoming ice spiders (#28262)
* fix

fixes #14242

* refactors ice spiders into giant_spiders.dm
2017-06-10 19:22:34 +02: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
Joan Lung
405fc7b0fe Adds Prolonging Prism as an application scripture (#28164) 2017-06-07 22:43:03 -03:00
Jordan Brown
5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Joan Lung
55d4fb8cca Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power (#28108) 2017-06-06 22:18:14 -03:00
kevinz000
703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07: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
Jordan Brown
d7ebd649ba Refactors the latejoin list (#26647) 2017-06-04 17:07:46 -03:00
AnturK
74febcf7bc Fixes bsa not showing up (#28032) 2017-06-04 09:42:50 -03:00
kevinz000
f756b6b9c2 the question is now , does this work? 2017-06-02 00:51:10 -07:00
kevinz000
6e5f20f58e thanks, robustin! 2017-06-01 23:07:07 -07:00
oranges
4493895336 Merge pull request #27879 from Cyberboss/CultFix
Fixes posters
2017-06-01 12:28:46 +12:00