Commit Graph

361 Commits

Author SHA1 Message Date
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 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined 7147e51a18 Merge pull request #12645 from Citinited/pa-radiation-fix
Makes the particle accelerator dangerous
2020-03-05 18:27:45 -05: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
FreeStylaLT d911954920 Fixes reflectors and a Projectile angle bug 2019-12-15 12:04:29 +02:00
moxian ecbc1bea55 Singulo can now expand when placed directly by containment wall. (#12720) 2019-11-09 22:32:21 -05:00
Citinited a0f7c9cacb Particle accelerator will irradiate mobs again; adds COMSIG_CROSSED_MOVABLE signal 2019-10-25 00:50:42 +01:00
SteelSlayer e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -04:00
Fox McCloud 9e03f75a4b I-carry-onward 2019-10-06 00:26:03 -04:00
Fox McCloud 67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -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 d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -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 f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Couls fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Couls fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Fox McCloud 3dd2c80882 for now 2019-04-29 05:44:17 -04:00
Fox McCloud 7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Fox McCloud d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Couls a188a6b890 change some move procs 2019-04-23 05:56:12 -04:00
Fox McCloud 4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything
Gives the orphans a home
2019-04-21 18:44:38 -04:00
AffectedArc07 ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Fox McCloud 58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
TDSSS e70dbe1ad5 No more pushing singulos 2019-02-09 14:57:04 +01:00
Patrick Meade b4641b7fdb Some path normalization 2019-01-23 08:54:19 -06:00
Certhic e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Desolate 4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Purpose 037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
variableundefined bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Kyep 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
Bxil a1f540f238 Ports TG's Nar'Sie 2018-06-06 18:48:16 +02: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
tigercat2000 c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud 129e1f66f7 GC radio stuffs 2018-04-14 13:44:26 -04:00