Commit Graph

4062 Commits

Author SHA1 Message Date
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
Jordan Brown afc5640fd6 Merge pull request #29145 from kevinz000/patch-244
Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 20:45:08 -04:00
Jordan Brown d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -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
kevinz000 248cf95273 Update flashbang.dm (#29136) 2017-07-09 08:43:43 -03:00
kevinz000 5e80b018eb Update vending_items.dm 2017-07-08 13:57:10 -07:00
Joan Lung 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Tacolizard 5868aedcab initial (#29075) 2017-07-06 22:10:01 -03:00
Jordan Brown a2d25af44b Merge pull request #29006 from Xhuis/twohand_storage_fix
Fixes forced two-handed weapons being unstorable
2017-07-05 20:52:03 -04:00
PKPenguin321 2d599e1b97 Adds the circle game (#28961)
* adds the circle game
- adds an inventory sprite to weapons.dmi
- adds the code for the hand "object" to weaponry.dm
- adds emote datum code for making your hand a circle to emote.dm

* fixes
- makes sure the emote is actually ran before creating objects
- qdels the new object if it fails to get placed into the mobs hand

* adds a message to the user when emote fails

* added special examine reactions
- added new proc to items.dm
- added handling for the proc in human/examine.dm
- added special examine reaction to the circled hand in weaponry.dm
- removed a check on the circle emote that made it not work in emote.dm

* defines, a fix

* undoes last two commits
2017-07-04 22:25:51 -04:00
Xhuis 334df25e69 show them messages 2017-07-04 11:03:34 -04:00
Pigeons d5159f0e35 Fixes for charter autoaccept 2017-07-03 20:52:34 -04:00
Xhuis 8ad0737cf5 Forced two-handed objects can now be stored 2017-07-03 11:01:43 -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
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
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
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
Jordan Brown bd94c01f26 Stamina projectiles no longer set off grenades and flamethrowers (#28486) 2017-06-22 12:59:43 -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
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
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
Lularian 8d12c27499 belts 2017-06-19 15:46:47 -05:00
Joan Lung 38ec5563dc Fixes slips 2017-06-19 14:57:25 -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
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
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
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