Commit Graph
406 Commits
Author SHA1 Message Date
AffectedArc07 51245ad1a0 Merge remote-tracking branch 'Paradise/master' into pr/RedWolfie/14328 2020-09-18 17:56:37 +01:00
Certhic db5249032d secure fridge tgui 2020-09-18 18:14:13 +02:00
Certhic 621d03a7fe 2 missing tgui.update 2020-09-17 13:11:07 +02:00
Certhic 0776d349ed tgui_act secure fridge 2020-09-17 13:07:04 +02:00
Certhic 036be0e42c sstgui.update 2020-09-17 11:41:02 +02:00
AffectedArc07andGitHub 90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
SteelSlayer dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
LumiandGitHub 08e92ee6a7 Adds pancakes. (#14130)
* Pancakes

Adds pancakes, berry pancakes and choc-chip pancakes.
2020-09-16 09:41:42 -04: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
Certhic 61bab7c277 smartfridge tgui 2020-09-16 15:19:56 +02:00
SteelSlayer 6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07andGitHub ec595f9bbe Merge pull request #14214 from RedWolfie/glass
[Bugfix] Fixes shotglasses
2020-09-02 10:05:35 +01:00
Certhic ca82d79d87 fixes shotglass burning 2020-09-02 10:04:23 +02:00
AffectedArc07andGitHub 5b87692c19 Merge pull request #14157 from Qwertytoforty/Salt-is-a-way-of-life
Makes human meats flavor more accurate to the feelings of the owner
2020-08-31 23:06:00 +01:00
Qwertytoforty e3768e8ac5 Makes human meat more accurate to the feelings of the owner 2020-08-27 12:02:15 -04:00
SteelSlayer 1b9ef55246 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-25 16:36:13 -05:00
AffectedArc07 7e2546827f Restores ability to set transfer amount on glasses 2020-08-20 12:06:18 +01:00
AffectedArc07andGitHub af8d14e1ee Merge pull request #14045 from dearmochi/auto-menders-fit-in-fridges
Refactor Smart Fridges, allow auto-menders to be put in Medical Fridges
2020-08-16 19:08:48 +01:00
mochi 7dac6c1391 Rename seed smartfridge, use access constants 2020-08-16 15:13:10 +02:00
SteelSlayer 609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
mochi a7e1cc4830 Smart spans 2020-08-13 11:12:08 +02:00
mochi 954c76774d Refactor Smart Fridges 2020-08-12 01:16:12 +02:00
mochi a37dc85fc5 Medical Fridge accepts auto-menders 2020-08-09 10:22:18 +02:00
SteelSlayer d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
SteelSlayer ba2543810f Hides the "Set transfer amount" verb on certain items like syringes 2020-08-05 14:26:00 -05:00
SteelSlayer 06686a302a Adds a bunch of SStgui.close_uis(wires) 2020-08-01 14:40:06 -05:00
warior4356 0911425f2b Final tweaks and fixes 2020-07-14 01:43:00 -07:00
warior4356 cb06ebdd9f Refactor complete. Matches added. 2020-07-13 22:05:56 -07:00
Fox McCloud 38c9c508e6 Makes Ice Cream GC 2020-07-09 11:03:12 -04:00
Fox McCloud 8852a9de58 Makes New Players GC 2020-07-01 10:45:42 -04:00
Fox McCloudandGitHub e438ff4d36 Makes Mobs Lazier and Removes Hard References (#13693)
* Makes Mobs Lazier and Removes Hard References

* fluff
2020-06-30 17:52:28 -06:00
dearmochiandGitHub 9424a80dcd Merge branch 'master' into list-memory-optimization 2020-06-25 09:15:18 +02:00
mochi 096bc87dd3 Actually plug armor procs to armor modification code 2020-06-23 09:41:48 +02:00
mochi bdffdc1f9a Fix sake makiroll recipe, "makiroll" -> "maki roll" 2020-06-22 20:59:08 +02:00
AffectedArc07 88f71cc151 Bumps to DreamChecker 1.4 2020-06-20 10:51:26 +01:00
Fox McCloudandGitHub 1a1e564124 Fixes Unhackable Smartfridges (#13620) 2020-06-18 15:59:17 -04:00
Luca 266a422e05 Merge conflict solved(?) 2020-06-14 01:50:07 +10: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
AffectedArc07andGitHub 928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
NokkoandGitHub e70e40546a Allow the Cloning Pod to accept monster meat as a source of biomass (#13216)
* Make monster meats food/snacks/meat/
Special case: they are not however cutlet-able.

* Revert "Make monster meats food/snacks/meat/"

This reverts commit 1c531d26a6.

* Make the Cloning Pod check for a BIOMASSABLE var on items it sucks in

Begone, hardcoded meat-only biomass!

* Try a different approach to cloning pod item filtering

Globaaaals!

* Adjust comments and remove old unreverted code

* Fix mapfile with lizardmeat in it

* Fix style

Implements all of @farie82's suggestions
2020-04-10 21:42:07 -06:00
farie82andGitHub 604daa05e1 Adds a new logging system and a logging view (#13115)
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
2020-03-21 17:28:20 -06:00
AffectedArc07andGitHub 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
AffectedArc07andGitHub 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
Ty-OmahaandGitHub bb340f076d Kentucky Fried Vox (#13114)
* is finger lickin goods yaya

* is code improvements yaya

* is updates yaya
2020-03-17 15:12:52 -04:00
AffectedArc07 a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
AquilarandGitHub faa221c36b Makes personal crafting for all recipes work again. (#13032)
* allows personal crafting check tools to use paths again while preserving tool behaviours
converted all recipes from tools to tool behaviours.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

* changes it to be a lot cleaner.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

* more changes, like new proc and making so lists are separated properly

* efficiency things

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-01 14:57:06 -07:00
Fox McCloudandGitHub 306fdd6629 Merge pull request #12934 from farie82/Item-armor-fix
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
2020-02-24 19:42:19 -05:00
AffectedArc07andGitHub 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
CitinitedandGitHub 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
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00