cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,405 Commits 26 Branches 2 Tags
ca29f5340ee92befe2cffb25bcf248621de73ff3
Commit Graph

287 Commits

Author SHA1 Message Date
SteelSlayer
5e9b50b669 Merge remote-tracking branch 'upstream/master' into air-injector-link-fix 2020-10-17 11:38:41 -05:00
SteelSlayer
ace224a2de Update filter.dm 2020-10-15 16:38:17 -05:00
AffectedArc07
eecb08d8d6 Fixes spurious failures in pipe icon generation (#14585) 2020-10-14 16:22:26 -04:00
SteelSlayer
ea004bddcf copy and paste be gone 2020-10-11 13:16:10 -05:00
SteelSlayer
e18ec44a68 Merge remote-tracking branch 'upstream/master' into air-injector-link-fix 2020-09-23 12:17:06 -05:00
SteelSlayer
0dcfbad8d3 gets rid of : usage 2020-09-21 23:17:51 -05:00
SteelSlayer
c8f8b21eef tgui portable scrubber 2020-09-19 09:47:19 -05:00
SteelSlayer
395dd7df75 tgui mixer 2020-09-16 15:05:42 -05:00
AffectedArc07
1d59e4944b Merge remote-tracking branch 'ParadiseSS13/master' into pr/SteelSlayer/14320 2020-09-16 13:07:11 +01:00
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos 
Removes omni gas devices
 2020-09-15 22:27:42 -04:00
SteelSlayer
a466c1e682 forgot some stuff 2020-09-15 20:46:03 -05:00
SteelSlayer
98a77af506 Merge remote-tracking branch 'upstream/master' into tgui-filter 2020-09-15 20:25:24 -05:00
SteelSlayer
aafd9ca27a tgui filters 2020-09-15 20:19:03 -05:00
SteelSlayer
9ac96f1daa tgui pumps 2020-09-15 01:03:30 -05:00
mochi
a5622c34ef Light refactor of vent_pump/process_atmos 2020-09-10 17:58:48 +02:00
mochi
4c8e91daa9 Fix vent bursting sending non-living mobs flying 2020-09-10 17:53:02 +02:00
Certhic
cede116f6a fixed a welding message for the blind 2020-09-07 21:40:15 +02:00
SteelSlayer
a74c88299c trailing new line 2020-09-07 12:11:35 -05:00
SteelSlayer
0bf9aa199e Merge remote-tracking branch 'upstream/master' into air-injector-link-fix 2020-09-07 11:32:12 -05:00
AffectedArc07
91b40eab92 Removes omni gas devices 2020-09-02 11:49:45 +01:00
Fox McCloud
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
Fox McCloud
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
AffectedArc07
8294741b50 Removes some old and broken features 2020-06-21 21:12:27 +01:00
SteelSlayer
675a529d62 Merge remote-tracking branch 'upstream/master' into air-injector-link-fix 2020-06-18 13:34:50 -05:00
AffectedArc07
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
SteelSlayer
59680db186 CRLF to LF 2020-03-18 12:56:15 -05:00
SteelSlayer
13d3f3239b Merge branch 'master' into air-injector-link-fix 2020-03-18 12:54:09 -05:00
AffectedArc07
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
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Citinited
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
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
SteelSlayer
2bf7c04794 Makes radio signals update properly when you change their host machine's frequency 
Update machinery.dm
 2019-12-31 22:58:37 -06:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
TDSSS
01bd22c34c Welded vents bursting open (#12481) 2019-10-04 14:46:49 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud
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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Mark van Alphen
3e60237b52 Syndicatre base map fixes 2019-06-02 04:18:10 +02:00
Mark van Alphen
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
Mark van Alphen
9009cd443e Fix pipe layering 2019-05-04 00:47:16 +02:00
Mark van Alphen
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
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
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
Mark van Alphen
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
Mark van Alphen
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Arkatos1
fa6a27e3a9 Fixes invalid indentation 2019-04-22 18:49:30 +02:00