Commit Graph

91 Commits

Author SHA1 Message Date
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud 306fdd6629 Merge pull request #12934 from farie82/Item-armor-fix
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
2020-02-24 19:42:19 -05:00
Citinited fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
joep van der velden c8ac344345 Fixed DNA disks runtiming (whoops) and plastic rings 2020-01-29 11:16:54 +01:00
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
TDSSS 41b638bd33 Gloves stuff 2019-09-21 21:34:08 +02:00
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
AzuleUtama c6c426d363 Headpat Gloves now use same click speed as the North Star gloves 2019-09-06 18:36:02 +01:00
AzuleUtama 7c54de5442 Fixes a couple of object descriptions 2019-09-05 23:01:19 +01:00
Shadow 1095bdae86 :fox: 2019-09-02 14:47:49 -05:00
Fox McCloud 1aa0049e55 what the heck, let's do it 2019-08-29 17:41:42 -04:00
Fox McCloud 7087c029cf Refactors Gloves of the North Star 2019-08-29 17:22:13 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Arkatos1 fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00
Fox McCloud 29002efd98 Updates and Buffs Power Gloves 2019-04-06 01:38:02 -04:00
FalseIncarnate 3c03834571 Benjaminfallout Fluff Item
Adds Benjaminfallout's fluff item: a personalized ring.

Ckey: `benjaminfallout`
Character Name: `Pretzel's Ring"

![ring image](https://i.gyazo.com/b709324b79e2845cae16eb305d7d5cc3.png)

Approved by Kyet
2019-03-22 23:14:52 -04:00
tigercat2000 f619a49ac6 Merge pull request #10082 from variableundefined/GlovesLog
Add attack log to stun gloves
2018-11-01 22:44:21 -07:00
variableundefined cea8b8294d Add attack log to stun gloves 2018-11-01 07:24:22 +08:00
Purpose 47e814cf51 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one 2018-10-19 10:47:57 +01:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Purpose 621a2a7f9d bed time 2018-10-15 00:47:13 +01:00
Fox McCloud 7fedb9363a capitals 2018-06-03 20:09:15 -04:00
Fox McCloud 45858df458 Ports Gloves of the North Star 2018-05-17 17:20:28 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
Mars 4451354398 Makes cutting off fingertips optional 2017-10-08 17:26:10 +02:00
Sam 7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam 4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
FlattestGuitar 362b19f7bf Adds forensics gloves 2017-06-08 21:21:23 +02:00
Crazy Lemon ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox-McCloud 35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Fox-McCloud f85f295f09 spacingggg 2017-01-26 08:15:42 -05:00
Fox-McCloud 68c0bea660 customize 2017-01-18 18:38:01 -05:00
Fox-McCloud fa1a3ee49e Adds in Stun Gloves 2017-01-16 19:11:03 -05:00
SamCroswell 1c6ae3ff4a SWAT Glove Icon 2016-08-10 15:57:56 -04:00
TheDZD 0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Aurorablade 0cb31c70c2 Mangled fingerless gloves
or fethas attempts to address black gloves
2016-07-29 18:05:48 -04:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Fox-McCloud e039d4debe Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change 2016-07-18 00:30:50 -04:00
TheDZD 52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
TheDZD c51e6674cb Of powergloves and pedantry 2016-06-01 17:09:16 -04:00
Tastyfish 81d91df5ce Makes fingerless gloves functionally clipped 2016-04-07 17:02:17 -04:00