Commit Graph
7135 Commits
Author SHA1 Message Date
datlo 47e3cdc7b5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-03-26 10:26:18 +01:00
23490a52bf fix (#13180)
Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-24 12:19:48 -06:00
datlo 95b0430e2d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-03-23 11:14:57 +01:00
farie82andGitHub ebded4f39e Logging prio changes (#13174) 2020-03-22 20:47:51 -06:00
40a736b9d5 Fixes the issues with deconstructing and tool do_afters (#13177)
Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-22 18:34:38 -06:00
datlo 9ff8a23ae2 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-03-22 12:32:54 +01:00
datlo 61adc6abb9 Add wizard loadouts 2020-03-22 12:32:51 +01:00
farie82andGitHub 9338b7a0ed Merge branch 'master' into runtime-fix-2 2020-03-22 08:36:40 +01:00
63ea21b20e Adds support for multiple callback checks for the do_after and incapacitated procs (#13057)
* do_after refactor

Update slime.dm

fix a comment

if you read this you get a cookie!

* some little tweaks

Changes a TRUE to FALSE in a comment, got confused there.

Removes the code that checks for non-callbacks in the extra_checks list and removes them. It should be up to the dev to not add non-callbacks to this list. I'd rather have it runtime instead

* check_for_true_callbacks

* CRLF to LF

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-21 18:21:12 -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
fb9a10a681 More storage alt-click storage fixes (#13145)
* fix not being able to open secure wall safes

* add fingerprint handling and bag-opening sound

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-20 22:03:27 -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
SteelSlayer 5a699e5232 CRLF to LF 2020-03-18 12:06:47 -05:00
SteelSlayer 99aefa9082 Merge branch 'master' into internals-auto-push-up 2020-03-18 12:03:13 -05:00
joep van der velden f26f9cf0b6 line fixes 2020-03-18 17:02:44 +01:00
joep van der velden 07ffa0f60a Merge branch 'ParadiseSS13/master' into runtime-fix-2 2020-03-18 16:59:49 +01:00
Aquilar 25102492c0 Merge branch 'master' into blueprintpinpointerfix
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2020-03-18 15:06:19 +08: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
SteelSlayer 4a12c0bb5c Fixes some oversights with storage altclicking
Update secure.dm
2020-03-15 11:40:36 -05:00
Aquilar 6064243009 simpler 2020-03-15 12:59:36 +08:00
Fox McCloudandGitHub 48d0dfdacc Merge pull request #12863 from SteelSlayer/altclick-storage
Adds an alt-click shortcut for opening storage items
2020-03-14 23:26:05 -04:00
SteelSlayer 276bf1adc2 this makes more sense 2020-03-14 15:26:26 -05:00
Fox McCloudandGitHub c167bbd52d Merge pull request #12644 from datlo/hisgraceimprovement
Make His Grace simpler to link with
2020-03-14 15:58:58 -04:00
Fox McCloudandGitHub 64440fd8de Merge pull request #12855 from SteelSlayer/cyberfloor
Adds circuit flooring to the floor painter
2020-03-14 15:46:56 -04:00
Fox McCloudandGitHub 8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define
Replaces all var/const with #define
2020-03-14 15:33:44 -04:00
Fox McCloudandGitHub 9d678f42af Merge pull request #13066 from Quantum-M/gameBooks
SOP Books now read the SOP on the wiki and has new sprites
2020-03-14 15:23:11 -04:00
AffectedArc07andGitHub 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud 47263ded27 Merge remote-tracking branch 'upstream/master' into cig-tweaks 2020-03-08 22:35:49 -04:00
variableundefinedandGitHub edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00
variableundefinedandGitHub d8a934381c Merge pull request #12854 from Darkmight9/ERT_and_Dsquad_bag_space
Increases bag space of ERTs and death squads
2020-03-08 03:34:23 -04:00
Fox McCloudandGitHub 29f571dfc7 Merge pull request #13069 from Aquilar/blueshieldbackpacksforrobbie
new blueshield backpacks (sprites by Rapaskoti)
2020-03-08 03:33:54 -04:00
Fox McCloudandGitHub 05cb278235 Merge pull request #13026 from AzuleUtama/chamflagIllegals
Lowers illegal tech level of chameleon flag
2020-03-08 03:32:28 -04:00
Fox McCloud 1f4cc7c75f clean up 2020-03-07 17:41:17 -05:00
Fox McCloud 4d9c89bdc0 menthol 2020-03-06 23:48:32 -05:00
Aquilar c9bc00f654 grammar errors 2020-03-04 14:52:40 +08:00
Aquilar b43f41ee47 making sure Rapaskoti's new icons work, and coding what they wanted to do.
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-04 14:27:41 +08:00
Fox McCloud c059b6ba95 Cigarette Tweaks 2020-03-04 00:32:39 -05:00
AffectedArc07 a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Bryan ff585ccd04 Code and Sprite changes 2020-03-02 21:29:45 -07:00
Ty-OmahaandGitHub 77dd66942e Barber scissors refactor (#13038)
* Scissor refactor

* removed junk from comment
2020-03-01 13:08:28 -07:00
Fox McCloudandGitHub 8f297aa4d0 Merge pull request #12683 from MarsM0nd/order_conscription_kit
Brings orderable conscription kit in line.
2020-02-24 19:48:46 -05: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
AzuleUtama dcf0be91a1 Lowers illegals tech level of chameleon flag 2020-02-24 18:24:26 +00:00
Fox McCloud c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07andGitHub af9ed93abf Fixes this 2020-02-22 16:39:41 +00:00
AffectedArc07andGitHub 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
variableundefinedandGitHub ee10addad1 Prevent stacks from being consumed by redspace. (#12661)
* Fix stacks being consumed by redspace.

Fixes #12606

* Add comment on why (I think) the stack fix happens to work.

* Fix a potential minor logic error.

If the stack has no items left, we drop it, it gets merged
with another stack on the ground, then we should still report
the stack as having zero items.

Otherwise there's a potential to accidentally use items on the ground
once you run out of items in hand, which is slightly surprising.
2020-02-15 22:53:40 -05:00
farie82andGitHub c0010a0249 Makes the mindslave message bigger (#12960) 2020-02-15 17:36:51 -07: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