Commit Graph

6173 Commits

Author SHA1 Message Date
bawhoppen b666bd58b0 Makes dressers buildable (#28611) 2017-06-21 09:45:04 -03:00
ClosingBracket ed1855f5c8 Fixed small spelling + punctuation errors (#28631) 2017-06-21 09:43:59 -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 2fd25c63d6 Merge pull request #28618 from ExcessiveUseOfCobblestone/patch-4
Fixes shining lights into peoples eyes
2017-06-20 21:05:59 -04:00
Jordan Brown 6b4f2c03c6 Meh 2017-06-20 21:05:50 -04:00
bgobandit 078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Jordan Brown 6126cbe705 Merge pull request #28612 from Bawhoppen/3branch
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 16:36:23 -04:00
bawhoppen bcb87d9135 truth 2017-06-20 15:25:51 -05:00
Tacolizard fded49c639 Adds some custom force strings and fixes a bug (#28597)
* initial

* singuloth

* melee

* fix

* forgot a quote

* cyber1

* cyber2

* capitalization

* cyber3
2017-06-20 15:51:08 -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
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
ExcessiveUseOfCobblestone bc841222b3 Update flashlight.dm 2017-06-19 19:39:23 -04:00
Lularian 8d12c27499 belts 2017-06-19 15:46:47 -05:00
Joan Lung 38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
pigeons bdc4c9412e Refactors PDA cartridge permissions (#28567)
* Refactors cartridge access into bitflags

* Adds BitCount helper

* refactors cartridge access in virus cartridge

* Adds comments to BitCount

* detonate -> detonatable for readability, undetonatable PDAs will no longer show they've successfully detonated after sending virus

* dumb

* edits

* .

* space
2017-06-19 14:56:41 -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
Ashe Higgs a405334588 Construction alien closets now consumes two alloy (#28573) 2017-06-18 21:20:06 -04:00
Expletive 1860e1a2ea Paper frames, but with new sprites. (#28452)
* Paper frames, take two

* With entirely new sprites

* and basemap

* no directional doors also smoothing

* changes requested

* woops

* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
Jordan Brown 91d59af7c4 Merge pull request #28531 from Expletive/crayonpdas
Move the clown and mime's unique crayons to their PDAs.
2017-06-18 10:10:05 -04:00
bgobandit 5bc348c366 Adds traitor steal objective: the Supermatter Sliver. (Fixed) (#27913)
* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
Expletive 9f1c198b13 Space cash descriptions are more descriptive (#28508) 2017-06-17 22:55:09 -03:00
Expletive 5eef7d52bc Merge branch 'master' into crayonpdas 2017-06-17 18:39:18 -07:00
Jordan Brown 187ae0bd0e Merge pull request #28419 from Expletive/pocketprotectors
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
Joan Lung 8fd4098d2e Merge pull request #28506 from RandomMarine/RCDvals
Makes RCD ammo use consistent + small speed tweaks
2017-06-17 15:55:54 -04:00
Joan Lung f07435337c Merge pull request #28435 from lzimann/typecaches
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
Lzimann 42aa0dd3aa Changes all the typecaches to the obj definition 2017-06-17 13:24:40 -03:00
Expletive e5c22d527e Move unique crayons 2017-06-16 21:27:39 -07:00
Expletive fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Ashe Higgs 88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Leo a95aa5443f Merge pull request #28395 from Thunder12345/genuinecatproducts
Adds genuine cat fur products
2017-06-16 14:51:03 -03:00
RandomMarine 815233a2ea RCD ammo use consistency 2017-06-15 22:57:17 -07:00
Robustin ad25367887 inducer fix (#28464) 2017-06-15 19:03:44 -05:00
kevinz000 b6a4a32633 Adds a check_tick to pneumatic cannon examine (#28345) 2017-06-14 09:59:40 -03:00
Joan Lung 56e391561b Merge pull request #28413 from optimumtact/cellulardestruction
Fix runtime in inducer emp act
2017-06-13 22:22:30 -04:00
Joan Lung 0e29560b9e Merge pull request #28404 from Expletive/fancymedalbox
Medal lockboxes are now fancy, and will accurately represent their contents.
2017-06-13 20:40:51 -04:00
Joan Lung 91f26d2766 Merge pull request #28399 from Tacolizard/fireaf
Minor flamethrower fix
2017-06-13 18:12:38 -04:00
Lzimann 3b7fc1afc2 Changes a lot of is_type_in_list to use a typecache 2017-06-13 15:56:09 -03:00
Expletive 7d4b3c38f7 Mutable Appearances 2017-06-13 10:32:35 -07:00
Joan Lung fc7654aca1 Merge pull request #28393 from Cyberboss/patch-131
[s] Fixes charter exploit
2017-06-13 13:12:15 -04:00
kevinz000 968a384605 Fixes dead PKborgs having active dampener fields (#28214)
* Create robot_items.dm

* on mob death
2017-06-13 09:23:18 +02:00
Expletive a032a81989 Merge branch 'master' into pocketprotectors 2017-06-12 22:25:54 -07:00
Expletive f24a84d5a4 Adds pocket protectors and gives them to a bunch of nerds. 2017-06-12 21:39:50 -07:00
oranges 14969aa8a9 Fix runtime in inducer emp act
Was not passing the severity into the cell's emp act
2017-06-13 02:43:52 +00:00
Expletive 4aedb9c327 changesrequested 2017-06-12 14:48:37 -07:00
Expletive 5396d60f44 Flashdarks can't be used for examining eyes/mouth. (#28352) 2017-06-12 18:36:57 -03:00
Expletive 1609a4aeb1 Makes medal boxes fancy. 2017-06-12 13:53:50 -07:00