Commit Graph
4623 Commits
Author SHA1 Message Date
AffectedArc07 a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Bryan ff585ccd04 Code and Sprite changes 2020-03-02 21:29:45 -07:00
Ty-OmahaandGitHub 77dd66942e Barber scissors refactor (#13038)
* Scissor refactor

* removed junk from comment
2020-03-01 13:08:28 -07:00
Fox McCloudandGitHub 8f297aa4d0 Merge pull request #12683 from MarsM0nd/order_conscription_kit
Brings orderable conscription kit in line.
2020-02-24 19:48:46 -05:00
Fox McCloudandGitHub 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
Fox McCloud c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07andGitHub 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
farie82andGitHub c0010a0249 Makes the mindslave message bigger (#12960) 2020-02-15 17:36:51 -07:00
CitinitedandGitHub 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 5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
SteelSlayer b015fbd163 Adds an alt-click shortcut for opening storage items 2019-12-29 21:30:08 -06:00
Darkmight9 c5ee1c68dd Increases bag space of ERTs and death squads 2019-12-27 18:59:07 -05:00
SteelSlayer 84271962fe Internals activation QoL tweak 2019-12-26 05:04:41 -06:00
Crazy LemonandGitHub cc72b2fa5e Merge pull request #12811 from Kyep/link_update_2
Domain link updates 2
2019-12-16 19:55:08 -08:00
Kyep fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
Darkmight9 f3ad67bd73 Changes the spray bottle in the full janitor belt to one with space cleaner in it 2019-12-12 17:27:52 -05:00
moxian 1d0b84addb Fix prisoner implant z-level checking.
- Can no longer hide in a locker from prisoner computer tracking
- locator no longer tracks implanted people across z-levels
2019-11-09 10:17:41 +00:00
Mars f2f7ec956a Orderable conscription kit only without ID 2019-10-31 15:43:35 +01:00
Evankhell561andvariableundefined af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloudandvariableundefined 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloudandvariableundefined 393b248835 Removes Ancient Storage Codersprite (#12594) 2019-10-27 00:22:12 -04:00
datlo 6368447f83 Add nodrop notification 2019-10-24 20:41:36 +02:00
datlo 902b270ab1 His grace action button now links the box 2019-10-24 20:31:54 +02:00
Fox McCloudandvariableundefined d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
AzuleUtamaandvariableundefined 3586683ef7 Vampire shapeshift and DNA scrambler clear flavourtext on use (#12546) 2019-10-15 20:07:40 -04:00
Fox McCloudandvariableundefined 39cc83501b Fixes Explosions (#12539) 2019-10-09 09:58:27 -04:00
Fox McCloudandvariableundefined 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloudandvariableundefined affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloudandvariableundefined a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
Fox McCloudandvariableundefined f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
Fox McCloudandvariableundefined 93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefinedandGitHub 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud 5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
SteelSlayerandvariableundefined 0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
Fox McCloud 99a6ee7827 the-bleakest-void-of-memento-mori 2019-10-02 00:38:08 -04:00
Fox McCloud d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud 2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefinedandGitHub e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07: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
Mars 8b87bd529c Slight refactor of conscription kit 2019-09-27 17:44:06 +02:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Mark van Alphenandvariableundefined 6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloudandvariableundefined cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloudandvariableundefined 86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
AzuleUtamaandvariableundefined da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloudandvariableundefined c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00