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
1742b14b7c
Deconstructing wires and mouses biting wires now is put in the investigate log
2020-04-12 09:51:29 +02: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
5194094d3a
Refactors Zone Selection ( #12523 )
2019-10-08 21:11:09 -04:00
a469d0fcf2
for-God-has-redeemed-us-all
2019-09-30 16:49:15 -04:00
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07: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
3dd2c80882
for now
2019-04-29 05:44:17 -04:00
7b57d2e319
fixups
2019-04-29 04:41:31 -04:00
d0a077f9d5
Powernet Refactor
2019-04-27 02:06:04 -04: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
90c9f3f479
Refacors Electrocution
2019-04-10 18:09:14 -04:00
877cfc4d7d
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
814e492a55
Suicide Refactor
2019-03-27 22:54:26 -04:00
86d2a1634c
Casing correction 1
2018-12-17 00:07:37 -05:00
6354631937
Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted
2018-12-01 00:13:21 +00:00
3825b4e1d5
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
96f5046f19
Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes
...
A few fixes
2018-10-12 13:48:02 +08:00
6c6d35d133
fixies
2018-10-11 22:02:23 +01:00
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
8302024201
Fixes wire cutting runtime and other potential runtime.
2018-08-29 20:02:42 +08:00
eaf4d642cb
Adds overheal to welder & cable coil
2018-07-26 22:22:50 +08:00
27ebe7a6fe
Standardized Robotic Organ Checking--Removes Mechassited Organs
2018-07-07 21:33:42 -04:00
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -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
ad53317db1
Merge Conflict Resolved
2018-04-17 11:24:50 -07:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
f023edefa7
Crayons color cables, cableColor now cable_color
2018-04-14 23:54:37 -07:00
5d52f60d9d
Comment about where merging is handled, moved to_transfer variable to immediately above where it is used
2018-04-13 18:27:20 -07:00
e875af3d56
Cable Coils can partial transfer, stripped depereciated code, changed cable coil message
2018-04-13 16:48:14 -07:00
369c654c70
moves material defines to construction.dm
...
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
8993e05a0b
Fixes easy cable laying
2017-07-16 16:44:46 -07:00
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
af68615415
Merge pull request #6956 from Crazylemon64/wire_mapload_fix
...
Away missions load cables and maploader landmarks smoothly now
2017-03-27 03:54:00 -04:00
babe5eb074
Away missions load cables, pipes, and templates OK now
2017-03-27 00:37:24 -07:00
9ed89ef7cd
Fixes Stack Merge Oddities
2017-03-24 04:44:04 -04:00
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01:00
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
2a9bcde361
Fix conflicts.
2017-03-09 12:01:50 -03:00
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
3b73053bc4
Tool fixes
2017-03-06 20:46:24 +01:00
Fox McCloud