Commit Graph

386 Commits

Author SHA1 Message Date
joep van der velden 7cd7d76eb6 Makes laser tags have 0 damage + check in field/generator/bullet_act 2020-10-03 15:26:20 +02:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined e9e634bb20 Merge pull request #14239 from AffectedArc07/singulo-warning-tweaks
Improvements to singulo logging
2020-09-14 20:40:46 -04:00
SteelSlayer 6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07 a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul
Overhauls and Refactors Alarm System
2020-09-14 13:54:06 +01:00
AffectedArc07 41330a5de6 Improvements to singulo logging 2020-09-05 15:52:23 +01:00
SteelSlayer 609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
Kyep 1fa9862a20 Update code/modules/power/singularity/narsie.dm
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
2020-08-07 13:31:47 +00:00
Kyep c0f98deeab Fixes cult summon runtime 2020-08-07 06:26:03 -07:00
SteelSlayer 06686a302a Adds a bunch of SStgui.close_uis(wires) 2020-08-01 14:40:06 -05:00
SteelSlayer 960fe45410 actually I wanted to keep the attack hand bit 2020-07-05 01:44:57 -05:00
SteelSlayer 9cfd206885 tgui wires 2020-07-04 23:14:30 -05:00
Fox McCloud 85dc9136c6 singularity investigate 2020-07-01 22:07:30 -04:00
Fox McCloud f13ae9e167 Overhauls and Refactors Alarms 2020-07-01 17:41:47 -04:00
dearmochi 9424a80dcd Merge branch 'master' into list-memory-optimization 2020-06-25 09:15:18 +02:00
mochi aad3c76e5d Further clean up code, remove some arg defaults, fix some bugs 2020-06-22 23:43:45 +02:00
AffectedArc07 456132f442 Merge branch 'master' into byebye 2020-06-22 20:02:11 +01:00
Fox McCloud c8a7607129 Purges a Bunch of In World Calls (#13641)
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
2020-06-22 06:56:19 -06:00
AffectedArc07 8294741b50 Removes some old and broken features 2020-06-21 21:12:27 +01:00
Fox McCloud 5e3f95e140 Removes Set Background (#13646) 2020-06-20 14:33:46 -04:00
Moku Moku 07f085a6c4 Correcting Welder Messages on the Field Generator.
This simply swaps WELD and SLICE messages that were previously incorrect to instead reflect as to what they should actually do.
Hopefully this can clear up some confusion for players, aswell as making it just look cleaner.
2020-06-13 15:19:59 +02:00
joep van der velden d3743f83fa Improves bomb logging and replaces single attack log msges with actual logging 2020-06-08 23:44:06 +02:00
Fox McCloud 70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -06:00
Citinited 42b4313266 Increases distance of accelerated particles back to how they were 2020-03-24 13:48:29 +00: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
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