6ecc3d5234
Add ability to swap items in storage ( #13648 )
...
* Add ability to swap items in storage
Add ability to swap items in storage through
drag and drop
Fix "the the" message when putting item in storage
Clean code where possible
* Fix swap in stacked storages, clean up code (v3)
* Ignore restraints and lying for swapping items
* Clean up the code a bit, increase readability
* Clean up code, remove spawn(0)
* Fix some spacing issues
* Rename var, use crisp font
2020-12-22 16:15:40 -05:00
ab853bed7c
Merge remote-tracking branch 'upstream/master' into pull-move-rework
2020-08-17 21:35:35 +02:00
fcd6f900b9
Merge pull request #13175 from farie82/logging-improvements
...
Logging view improvements
2020-08-08 16:23:06 +01:00
cde0f13b53
Merge pull request #13675 from Fox-McCloud/glass-refactor
...
Finishes out Reagent Container Refactor
2020-06-27 00:52:18 -04:00
c6294bc3b0
Finishes out Reagent Container Refactor
2020-06-23 21:47:00 -04:00
aad3c76e5d
Further clean up code, remove some arg defaults, fix some bugs
2020-06-22 23:43:45 +02:00
7088de6bab
slippery component
2020-06-06 15:35:12 -05:00
0034d678a0
Merge branch 'master' into pull-move-rework
2020-06-06 06:57:22 +02:00
798cf7a8be
Removes Fat Sprites ( #13430 )
...
* Removes Fat Sprites
* fat vs chubby
* edge case
2020-05-23 03:10:39 -06:00
8c0222904e
Make pull/move force depend on mob size and make move_resist depond on itemweight
2020-04-28 21:46:41 +02:00
a37652b70c
Logging View scaling, health, formatting changes
2020-03-26 21:34:55 +01:00
210f8badf4
Makes all global variables handled by the GLOB controller ( #13152 )
...
* Handlers converted, now to fix 3532 compile errors
* 3532 compile fixes later, got runtimes on startup
* Well the server loads now atleast
* Take 2
* Oops
2020-03-20 21:56:37 -06:00
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
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
5170f3fbae
the-strength-of-this-world-fades
2019-10-04 19:34:08 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -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
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
0ad54794fc
Fixes Extinguishing Some Fires ( #12410 )
2019-09-24 16:39:12 -07:00
cb8529cdb8
Makes Xenobiology Simpler. Removes Slimes ( #12398 )
2019-09-24 16:17:33 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
db211cfc54
Deconflict
2019-09-11 23:00:13 -04:00
5943ad2902
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-10 07:09:30 -04:00
69537dd60c
Port TG hitby refactor and detonation of items by projectiles
2019-09-09 22:57:31 -04:00
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
177ac43f23
next-we-melt-the-memories-that-are
2019-09-09 16:20:04 -04:00
d19961378d
first-we-burn-away-the-world-that-was
2019-09-09 14:48:29 -04:00
607343424b
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-08 08:41:08 -04:00
dca6d98f5f
Refactors Corgis
2019-09-04 18:40:34 -04:00
289b890e76
Merge pull request #12087 from KasparoVy/skrekked_myself_up
...
Fixes Bug with Species-fitted Inhand Icons
2019-08-26 06:40:35 -04:00
285df0d994
Fixes Inhand Sprite Sheeting Bug
...
Caused by #11978 , the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
2019-08-25 22:29:16 -04:00
a968dc6a09
Merge pull request #11936 from farie82/antidrop-remove-on-drop
...
Dropped anti drop items now lose the antidrop status if not initialized with it
2019-08-24 10:53:23 -04:00
e18777959e
Merge pull request #11818 from Couls/baseball-deflects
...
Baseball!
2019-08-23 08:05:41 -04:00
6d7ee9c934
use hit_reaction instead
2019-08-23 00:40:44 -04:00
402d1ef131
No drop items now lose their nodrop if dropped
2019-07-29 00:03:18 +02:00
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
8822887784
Compile fix and asteroid turf placement fix
2019-06-03 01:21:03 +02:00
c6e6c6cefd
Even better water handling
2019-06-03 00:31:03 +02:00
acbf627f8c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
...
# Conflicts:
# code/modules/clothing/glasses/glasses.dm
# code/modules/customitems/item_defines.dm
2019-05-13 22:08:49 +02:00
90f71f164a
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00
93b45d91c5
Species chameleon fixes
2019-05-05 20:14:34 +02:00
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
c6a91eafdd
Tweaks
2019-05-01 16:04:07 +02:00
791bebf51c
Tweaks to Examine tooltips
2019-05-01 15:50:30 +02:00
5b6e80af44
Adds examine tooltips
2019-04-25 21:11:22 +02:00
03d894ecfc
Merge remote-tracking branch 'upstream/master' into fix-cqc
...
# Conflicts:
# code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
dearmochi