Commit Graph

9847 Commits

Author SHA1 Message Date
Leo ac96764660 Merge pull request #28851 from Cyberboss/RevertBorers
Removes cortical borers
2017-06-28 10:33:51 -03:00
Joan Lung d165ecc6f2 Rethemes the Necropolis (#28857)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks
2017-06-27 18:49:30 -03:00
Matthew Walker f3afd18551 Move eye_damage from /mob/ to eye organs (#28725)
* First test change, only damage

* take out unused var

* null check

* First test change, only damage

* take out unused var

* null check

* Fixes some wizard stuns (#28693)

* First test change, only damage

* take out unused var

* null check

* review changes

* Hate git
2017-06-27 16:51:29 -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
Really-Good-Soda-Flavor 930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853)
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
2017-06-27 09:19:25 -04:00
Jordan Brown ef96559701 Removes cortical borers 2017-06-26 11:21:08 -04:00
Jordan Brown dfc5a47c7e Merge pull request #28765 from KorPhaeron/tree
Small jungle trees
2017-06-26 10:41:52 -04:00
KorPhaeron 1fde4943b5 Initialize 2017-06-26 10:13:25 -04:00
KorPhaeron f5a1ce0492 Uses the proper icon file 2017-06-26 09:29:52 -04:00
Jordan Brown e9a66eb6ec Fixes resin attack message (#28789) 2017-06-26 13:02:52 +02:00
Jordan Brown fe1ee70961 Merge pull request #28766 from KorPhaeron/robot
Robotic legs are not weak to glass shards
2017-06-26 00:46:38 -04: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
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
Steelpoint 56a4c179b4 Station Engineers Spawn With Industrial Welder (#28740)
* InitialCommit

* LargeToSmall
2017-06-25 10:17:14 -04:00
KorPhaeron e8d425b227 Robotic limbs are not weak to glass 2017-06-24 15:53:30 -04:00
bgobandit 103d2d4e5b Fixes sm slivers not properly deleting (#28724) 2017-06-24 16:46:22 -03:00
KorPhaeron e00cae8d06 Small trees 2017-06-24 15:23:37 -04:00
AnturK 63716b792d Fixes bad del runtime (#28735)
* Fixes bad del runtime

* Only inserted item uses path here but let's future proof

* QDEL_NULL
2017-06-24 13:47:27 -03:00
pigeons 95c0e8c33b PDA Refactor Part 1: Phantom Blood Menace (#28681)
* Major PDA cleanup refactor

* Cleans up unecssary vars and helpers

* fixes around dumb cartridge - host_pda handling pre refactor

* whoops forgot about setting the mode

* Fixes cartridge not initializing host pda

* I don't know how vars work

* Initialize memes in cart.dm

* Should've gotten rid of this var
2017-06-23 21:59:17 -05:00
Jordan Brown 37e00d62bd Merge pull request #28716 from lzimann/offhand
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once
2017-06-23 15:07:37 -04:00
Ashe Higgs 2c047bd4c7 Intercoms are now constructable (#28659)
* Intercoms are now constructable

* l a t h e

* replaces on_wall with pixel_shift

* does the thing

* Adds an additional construction step
2017-06-23 14:39:43 -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
BeeSting12 b86c46b8c1 Fixes the sprite for the nullrod clown dagger skin (#28685) 2017-06-22 22:06:54 -03:00
Lzimann 88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Leo 4ac64a7014 Merge pull request #28673 from ShizCalev/sheet-fixes
Readds sprites for grey & nanotrasen bedsheets
2017-06-22 13:03:14 -03:00
Jordan Brown bd94c01f26 Stamina projectiles no longer set off grenades and flamethrowers (#28486) 2017-06-22 12:59:43 -03:00
Leo 62ae21ea23 Merge pull request #28664 from ShizCalev/shawarma-king
Fixes swarmers dying to radiation
2017-06-22 12:57:47 -03:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
Expletive 8e1b56bbd7 Flame thrower plasma tanks can be removed easily. (#28546) 2017-06-21 15:20:57 -03:00
Really-Good-Soda-Flavor 40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
shizcalev 1ee552ec0e readds sprites for grey and nantotrasen bedsheets
fixes #26500
fixes #28671
fixes #24468
2017-06-21 09:39:13 -04:00
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
shizcalev 4567effd7f fixes swarmers dying to rad 2017-06-21 00:01:40 -04: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
Jordan Brown 50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04: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
Jordan Brown c2069e0446 Merge pull request #28583 from Xhuis/equip_delay_framework
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 23:06:07 -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