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
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
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
4fcedcf4bd
Merge pull request #12904 from Arvenius169/MaxcapSpelling
...
Maxcap Devastation Range Spelling Fix
2020-02-24 19:40:27 -05:00
dcf0be91a1
Lowers illegals tech level of chameleon flag
2020-02-24 18:24:26 +00:00
c55ce4aab3
Adds CBD
2020-02-23 19:46:29 -05:00
af9ed93abf
Fixes this
2020-02-22 16:39:41 +00:00
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00:00
b5ef242d92
Dismantling tables using a screwdriver will leave a table frame
2020-02-16 11:52:22 +00:00
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
d27fdf7f09
Fix borg unbuckling ( #12926 )
...
* Fix borg buckling
* YOU CANT HANDLE THE TRUES
2020-02-15 18:25:25 -07:00
d342870bd8
Fixes some doubling up of sounds on tools
2020-02-16 00:49:06 +00:00
c0010a0249
Makes the mindslave message bigger ( #12960 )
2020-02-15 17:36:51 -07:00
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
Mitchell