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
5baaabe12e
Merge branch 'master' into var/const-to-define
2020-03-09 10:33:59 +00:00
cd857e378e
Removes Creatable Video Cameras
2020-03-04 12:57:23 -05:00
a1fa46f5a8
Merge branch 'master' into var/const-to-define
2020-03-03 22:44:07 +00:00
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
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00:00
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
fd913498bf
Make every obj/.../New() call it's parents
2020-01-29 10:43:32 +01:00
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
5b6819ceb5
Fixes R&D Materials Exploit ( #12608 )
2019-10-20 12:16:29 -04:00
6ceb3a8654
Makes Xenobio Related Things GC Better ( #12558 )
2019-10-12 19:37:46 -04:00
683640de24
fixing autolathe type
...
fixed a typo, changed compressed matter cardridge to compressed matter cartridge
2019-10-09 23:44:59 +01:00
c8eebd1b4b
Adds Leather to Biogenerator ( #12514 )
2019-10-08 21:12:09 -04:00
affa319fab
Removes Console Screens ( #12512 )
2019-10-08 21:07:50 -04:00
f4451fcb3d
Fixes Universal Damage Issues. Implements Proper Ricochets ( #12532 )
2019-10-08 20:41:40 -04:00
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
2224229fad
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-30 14:18:33 -04:00
ca5a552dec
red ones do go faster
2019-09-28 02:31:10 -04:00
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
cb8529cdb8
Makes Xenobiology Simpler. Removes Slimes ( #12398 )
2019-09-24 16:17:33 -07:00
86e6d85093
Nutrition Refactor ( #12389 )
2019-09-24 15:17:55 -07:00
62226851d9
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-23 12:53:52 -04:00
efc79cfc7c
Removes Bodyscanner Console ( #12377 )
2019-09-22 21:11:02 -07:00
c87389a595
TG Buckle Update ( #12375 )
2019-09-22 18:22:57 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
6f637b6014
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-17 11:24:58 -04:00
788f1926fb
though-our-bodies-be-ravaged
2019-09-15 19:49:52 -04:00
84a6a10b9b
review comments
2019-09-15 10:45:21 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
00c3b6ad41
limit the amount of monkeys spawned from monkey cubes
2019-09-14 21:18:45 -04:00
0854f75f7b
Fixes Pugs
2019-09-06 19:06:41 -04:00
a54cac4887
foxes are canines
2019-09-05 19:18:24 -04:00
dca6d98f5f
Refactors Corgis
2019-09-04 18:40:34 -04:00
1dc8e66cbc
Merge pull request #11772 from Couls/constructable-rechargers
...
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
3313efed23
Merge pull request #11981 from Fox-McCloud/lavaland-update
...
Major Lavaland Update
2019-08-16 22:22:49 -06:00
11e9ecadbf
Merge pull request #11894 from TheSardele/blender
...
Makes All-In-One Grinders constructable
2019-08-16 20:41:18 +08:00
3634687a88
Merge pull request #11374 from Quantum-M/removeTeleBoards
...
Removes telescience boards from RnD
2019-08-11 16:28:47 -04:00
f9c0fd2d25
fixes
2019-08-11 15:33:00 -04:00
ee0447dad6
Major Lavaland Update
2019-08-10 22:36:55 -04:00
a4485969db
Cleans up some reagentgrinder code
...
Removes a double check and fixes the circuit board description.
2019-07-21 10:18:19 +02:00
30f313cb93
Makes All-In-One Grinders constructable
...
All-In-One Grinders can now be constructed from a machine frame using the appropriate circuit board, 2 manipulators and a matter bin.
2019-07-19 17:58:52 +02:00
cf31a774a5
Rechargers can be built now
...
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
12b20b594d
Merge pull request #11738 from evankhellparadise/portableseed
...
Portable Seed Extractor design
2019-06-29 09:23:22 +08:00
caad8f8e5e
Portable Seed Extractor
2019-06-21 20:06:06 -04:00
fc2488c80e
new medical category in mechfab
2019-05-13 01:36:11 -04:00
56977dc052
Merge pull request #11376 from Arkatos1/Cardboard
...
Cardboard can now be made in the Biogenerator
2019-04-29 23:08:16 +08:00
85cb74bec5
Cardboard can now be made in the Biogenerator
2019-04-25 12:27:32 +02:00
fea1721d80
Pill Bottles are now printable in the Autolathe
2019-04-25 00:01:57 +02:00
d1f6ffc7aa
Removes boards
2019-04-21 14:52:59 -07:00
AffectedArc07