9ff8a23ae2
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts
2020-03-22 12:32:54 +01:00
61adc6abb9
Add wizard loadouts
2020-03-22 12:32:51 +01:00
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
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
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
f26f9cf0b6
line fixes
2020-03-18 17:02:44 +01:00
07ffa0f60a
Merge branch 'ParadiseSS13/master' into runtime-fix-2
2020-03-18 16:59:49 +01:00
898ca53e71
deconflict
...
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com >
2020-03-18 15:09:43 +08:00
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
8e75487346
Fixes CLRF
2020-03-17 17:43:11 -05:00
230e3d8abc
Merge branch 'master' into adddefibs
2020-03-17 17:26:29 -05:00
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
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
4a12c0bb5c
Fixes some oversights with storage altclicking
...
Update secure.dm
2020-03-15 11:40:36 -05:00
6064243009
simpler
2020-03-15 12:59:36 +08:00
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
276bf1adc2
this makes more sense
2020-03-14 15:26:26 -05:00
a65bb8e1e6
Zap Zap
2020-03-14 15:21:50 -05:00
c167bbd52d
Merge pull request #12644 from datlo/hisgraceimprovement
...
Make His Grace simpler to link with
2020-03-14 15:58:58 -04:00
64440fd8de
Merge pull request #12855 from SteelSlayer/cyberfloor
...
Adds circuit flooring to the floor painter
2020-03-14 15:46:56 -04:00
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
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
98b5a8014f
Merge pull request #13028 from farie82/barrier-walking
...
Walking through barriers now also lets a dragged carbon get through
2020-03-14 15:11:40 -04:00
3df642ffa4
Merge pull request #12678 from Kyep/depot_loot_fix
...
Fixes 12677 - depot self-destruct leaves loot behind
2020-03-14 15:03:09 -04:00
c48ad34c2d
Merge pull request #13061 from Quantum-M/aiLockerCheese
...
AI Cores are no longer able to fit in a locker
2020-03-14 14:19:41 -04:00
34d214cbb3
Requested Changes
2020-03-09 10:22:59 -07:00
5baaabe12e
Merge branch 'master' into var/const-to-define
2020-03-09 10:33:59 +00:00
47263ded27
Merge remote-tracking branch 'upstream/master' into cig-tweaks
2020-03-08 22:35:49 -04:00
edebec5194
Merge pull request #13021 from Fox-McCloud/add-cbd
...
Adds CBD
2020-03-08 21:46:20 -04:00
761ada255b
Update holosign.dm
2020-03-08 08:53:50 +01:00
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
29f571dfc7
Merge pull request #13069 from Aquilar/blueshieldbackpacksforrobbie
...
new blueshield backpacks (sprites by Rapaskoti)
2020-03-08 03:33:54 -04:00
05cb278235
Merge pull request #13026 from AzuleUtama/chamflagIllegals
...
Lowers illegal tech level of chameleon flag
2020-03-08 03:32:28 -04:00
7b06d2c2ea
Merge remote-tracking branch 'ParadiseSS13/master' into depot_loot_fix
2020-03-07 23:25:20 -08:00
394aff3a73
removes E.Destroy()
2020-03-07 23:25:06 -08:00
37cc564a1e
Merge pull request #12704 from moxian/paper-uid
...
Make paperwork popups use UID as a window id.
2020-03-07 18:50:54 -05:00
1f4cc7c75f
clean up
2020-03-07 17:41:17 -05:00
4d9c89bdc0
menthol
2020-03-06 23:48:32 -05:00
c9bc00f654
grammar errors
2020-03-04 14:52:40 +08:00
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
c059b6ba95
Cigarette Tweaks
2020-03-04 00:32:39 -05:00
a1fa46f5a8
Merge branch 'master' into var/const-to-define
2020-03-03 22:44:07 +00:00
ff585ccd04
Code and Sprite changes
2020-03-02 21:29:45 -07:00
e89a72d4f8
AI locker cheese
2020-03-01 16:38:04 -07:00
77dd66942e
Barber scissors refactor ( #13038 )
...
* Scissor refactor
* removed junk from comment
2020-03-01 13:08:28 -07:00
1dc7542473
Walking through barriers now also lets a dragged carbon get through
2020-02-25 11:30:34 +01:00
8f297aa4d0
Merge pull request #12683 from MarsM0nd/order_conscription_kit
...
Brings orderable conscription kit in line.
2020-02-24 19:48:46 -05:00
9a2f941f1d
Merge pull request #12986 from Citinited/bugfixes-two
...
Some more bugfixes from the tool refactor
2020-02-24 19:45:03 -05:00
datlo