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
e3f852dff6
magic numbers
2018-11-16 15:32:49 +01:00
544e548f4e
Merge pull request #9624 from alex-gh/unary_pipe_fix
...
It is no longer possible to duplicate uvents.
2018-10-20 08:37:53 +08:00
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
8898c7346b
It is no longer possible to duplicate uvents.
2018-09-27 22:52:16 +02:00
037f215d16
updates vars to use the defines
2018-09-16 01:22:57 +01:00
695d7b7c23
Remove debugging stuff
2018-04-28 18:04:38 -07:00
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
2b25584372
Merge remote-tracking branch 'upstream/master' into remove-weapons
2018-04-19 17:01:38 -04:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
4f777d76ea
Makes Pipenets Actually Rebuild and Pipes GC
2018-04-15 04:16:09 -04:00
129e1f66f7
GC radio stuffs
2018-04-14 13:44:26 -04:00
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -04:00
b14faa19c3
Merge remote-tracking branch 'upstream/master' into SMC
...
# Conflicts:
# code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
1ca410b91e
Fix various syntactic problems
2018-03-06 23:19:39 -08:00
dca16e60cf
PS -> SMC Ports: LINDA, Spacedrift, Throwing
...
This commit ports LINDA, spacedrifting, and throwing to the SMC.
2018-03-02 23:58:57 -08:00
AffectedArc07