c8f8b21eef
tgui portable scrubber
2020-09-19 09:47:19 -05:00
395dd7df75
tgui mixer
2020-09-16 15:05:42 -05:00
1d59e4944b
Merge remote-tracking branch 'ParadiseSS13/master' into pr/SteelSlayer/14320
2020-09-16 13:07:11 +01:00
1d5358f79b
Merge pull request #14215 from AffectedArc07/removes-omni-atmos
...
Removes omni gas devices
2020-09-15 22:27:42 -04:00
a466c1e682
forgot some stuff
2020-09-15 20:46:03 -05:00
98a77af506
Merge remote-tracking branch 'upstream/master' into tgui-filter
2020-09-15 20:25:24 -05:00
aafd9ca27a
tgui filters
2020-09-15 20:19:03 -05:00
9ac96f1daa
tgui pumps
2020-09-15 01:03:30 -05:00
a5622c34ef
Light refactor of vent_pump/process_atmos
2020-09-10 17:58:48 +02:00
4c8e91daa9
Fix vent bursting sending non-living mobs flying
2020-09-10 17:53:02 +02:00
cede116f6a
fixed a welding message for the blind
2020-09-07 21:40:15 +02:00
91b40eab92
Removes omni gas devices
2020-09-02 11:49:45 +01:00
b3d69aac9b
Moves to BYOND 513 ( #13650 )
...
* Fixes Orbiting
* moves to 513
* travis update
* check for minor version too
2020-06-26 01:15:59 -06:00
69de03a622
Gas Mixture Refactor ( #13602 )
...
* Gas Mixture Refactor
* derp
* defined turf types
* fixes
* cuts turf visuals cost in half
* even better equalizing with planetary atmos
* remove volatile fuel
* comment and documentatino on turf gas vars
2020-06-24 17:48:50 -06:00
8294741b50
Removes some old and broken features
2020-06-21 21:12:27 +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
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
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
01bd22c34c
Welded vents bursting open ( #12481 )
2019-10-04 14:46:49 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -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
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
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
3e60237b52
Syndicatre base map fixes
2019-06-02 04:18:10 +02:00
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
9009cd443e
Fix pipe layering
2019-05-04 00:47:16 +02:00
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
ad2238f496
Merge branch 'master' into lighting
2019-04-30 19:15:58 +02:00
92ec9cf253
Merge pull request #11348 from Arkatos1/AtmosShortcut
...
Adds shortcuts for handling pumps, volume pumps, filters, and mixers + Ability to rename them with a pen
2019-04-30 12:10:52 +08:00
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +02:00
c4dc5ecd3d
Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting
2019-04-22 18:52:55 +02:00
fa6a27e3a9
Fixes invalid indentation
2019-04-22 18:49:30 +02:00
cc35fb8b0c
Code improvement
2019-04-22 18:43:17 +02:00
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01:00
b00c44d701
Added ability to rename devices with a pen, sanity checks, reduced code spaghetti
2019-04-21 19:27:54 +02:00
3f6b8478ff
Added atmos shortcut for pumps, volume pumps, filters and mixers
2019-04-21 17:06:34 +02:00
211468b24f
Add fake ambient occlusion
2019-04-21 01:45:30 +02:00
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
93118f9d34
Remaps Toxins
2019-04-11 07:24:16 -04:00
45a066c7d1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
c370e08233
Port the actual Lavaland map (and associated fixes)
2019-03-30 04:12:37 +01:00
489359d6d1
Adds Unidentified Gas in Deep Space
2019-03-22 16:00:56 -04:00
6850d3d27a
multitool fixes
2018-11-20 14:21:25 +01:00
SteelSlayer