Commit Graph

1683 Commits

Author SHA1 Message Date
Xhuis
198b39acfc Missile no longer ricochet 2017-07-14 17:34:56 -04: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
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
Jordan Brown
c1e3ac82ec Merge pull request #29081 from Fox-McCloud/reflect-refactor
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
Fox-McCloud
46b16513e2 it's truly false 2017-07-06 16:13:22 -04: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
Fox-McCloud
380e938dae Minor Projectile Reflection Refactor 2017-07-06 02:45:30 -04:00
Joan Lung
888b2e093e Makes the lavaland pressure check a proc (#28954)
* Makes the lavaland pressure check a proc

* code that probably did nothing tm

* sss

* 50 should be a define instead
2017-07-02 20:14:42 -04:00
Supermichael777
f29a038d71 DNA syringe gun damage down to 'sane' from revolver (#28975)
* Fixes a bug

* This didnt do what I thought it did
2017-07-02 19:02:04 -03:00
Ergovisavi
f5d800a06d Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
# Conflicts:
#	icons/effects/96x96.dmi
2017-07-01 16:20:05 -07:00
Ergovisavi
1a118c0651 Merge branch 'master' of https://github.com/tgstation/tgstation into gero_gero
# Conflicts:
#	icons/effects/96x96.dmi
2017-06-30 21:31:32 -07:00
Xhuis
e1b0f6328c Fixes reskinned guns being invisible 2017-06-30 16:05:59 -04:00
Ergovisavi
999282e9d8 Junglestation frog mob take 1 2017-06-29 07:30:18 -07:00
kevinz000
226c0f1636 Fixes piggybacking giving person on top projectile density instead of the person on the bottom. (#28770) 2017-06-26 11:01:17 -03:00
Joan Lung
70e712017e Status effects start processing immediately instead of on the next timer subsystem tick (#28747)
* Status effects start processing immediately instead of on the next timer subsystem tick

* let's fix this while we're at it

* hup

* not technically efficient but better than not updating when needed
2017-06-25 12:47:10 -04:00
Steelpoint
f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Really-Good-Soda-Flavor
40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Jordan Brown
e5b1e68147 Adds a configurable message to be sent to mobs on polymorph (#28541) 2017-06-21 09:48:13 -03:00
Mike Long
39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Jordan Brown
c5e67b5ce1 Merge pull request #28619 from ChangelingRain/taserfix
Tasers and projectiles stun for the proper amount
2017-06-20 21:05:15 -04:00
Jordan Brown
cc4bd7a0bc Merge pull request #28599 from Xhuis/disabler_inhand_fix
Disablers now have an in-hand sprite (Fixes #28582)
2017-06-20 11:30: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
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
Joan Lung
cad788efef Tasers and projectiles stun for the proper amount 2017-06-19 20:43:56 -04:00
Xhuis
619e53e138 Fixes disablers lacking an inhand sprite 2017-06-19 11:51:19 -04:00
Joan Lung
cc3c809646 Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg 2017-06-18 23:10:25 -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
bgobandit
ed01357edd This month's spelling fix PR (#28502) 2017-06-17 09:35:30 -03:00
Leo
24f3e67dd8 Merge pull request #28421 from kevinz000/patch-220
fixes beam rifle flick aim exploit
2017-06-14 09:57:37 -03:00
Joan Lung
e74d0fdc50 Tweaks kinetic accelerator modkit effect ordering (#28359) 2017-06-13 09:15:38 -03:00
kevinz000
5add55c3e0 Create beam_rifle.dm 2017-06-13 00:01:05 -07:00
Joan Lung
f1f356a290 Merge pull request #28337 from lzimann/files
Changes all sound files to be lower case, plus standardizes their references
2017-06-11 14:50:41 -04:00
Leo
51dae8552a Merge pull request #28293 from ChangelingRain/lifestealstacking
If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them
2017-06-11 10:29:26 -03:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
ShizCalev
c82de6ccc1 fix (#28257)
fixes #11936
2017-06-10 19:20:24 +02:00
Joan Lung
fd7f65e7bd If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them 2017-06-09 20:55:52 -04:00
kevinz000
99138f12d0 I might HAVE accidently made dualwielding hilariously OP again so have a nerf! (#28125) 2017-06-07 11:13:57 -03:00
kevinz000
f051ecba25 Adds consciousness checks to beam rifles (#28079) 2017-06-05 22:37:54 -03:00
Joan Lung
180dd7bd84 Adds another unique KA mod to necropolis chests (#27982) 2017-06-05 14:52:03 -03:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Leo
39c4fb4aad Merge pull request #28036 from ChangelingRain/aoemodkitfix
Fixes AOE modkits not working because I messed up the logic
2017-06-04 12:28:44 -03:00
Expletive
70cdc48376 Fixes #27979 (#28002) 2017-06-04 12:11:44 +02:00
kevinz000
ca4efb04e9 Beam rifles now slowdown while scoped (#27898)
* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm
2017-06-04 07:12:22 +03:00
Nick
70506a29ae the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978) 2017-06-03 23:45:28 -03:00
Joan Lung
807a778b4c Fixes AOE modkits not working because I messed up the logic 2017-06-03 09:39:17 -04:00