cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 23:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

69 Commits

Author SHA1 Message Date
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
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
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
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -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
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
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
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
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
Mark van Alphen
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Fox McCloud
489359d6d1 Adds Unidentified Gas in Deep Space 2019-03-22 16:00:56 -04:00
Certhic
6850d3d27a multitool fixes 2018-11-20 14:21:25 +01:00
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
variableundefined
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
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
alex-gh
8898c7346b It is no longer possible to duplicate uvents. 2018-09-27 22:52:16 +02:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
tigercat2000
695d7b7c23 Remove debugging stuff 2018-04-28 18:04:38 -07:00
tigercat2000
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
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
4f777d76ea Makes Pipenets Actually Rebuild and Pipes GC 2018-04-15 04:16:09 -04:00
Fox McCloud
129e1f66f7 GC radio stuffs 2018-04-14 13:44:26 -04:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC 
# Conflicts:
#	code/__DEFINES/flags.dm
 2018-03-22 15:35:12 -07:00
Tad Hardesty
1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
tigercat2000
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
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04:00
Fox-McCloud
543add7c10 Initial Commit 2017-08-10 18:01:03 -04:00
Sam
0c97c47dd8 Fixes the wording on opening vents 2017-03-19 00:42:14 +00:00
Markolie
60496300ea Fix attack message on vent weld 2017-03-13 13:42:12 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Kyep
e5ab12acd0 PR 2 Creation 2017-01-07 00:18:43 -08:00
Kyep
9b008e6635 Improvement 2017-01-02 03:40:14 -08:00
Kyep
0456465470 Fixes #5097 2017-01-02 03:36:12 -08:00
Scriblon
1f26c67031 Scrubbers now respect air alarm settings. 
Scrubbers only worked when there was CO2, Toxins, or trace gasses in the
atmosphere, ignoring settings on the Air Alarm.
This commit fixes that and makes the scrubber respect the settings.
 2016-10-22 15:25:44 +02:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 
All hail glorious leader tigercat
 2016-07-08 00:16:28 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00