7758 Commits
Author SHA1 Message Date
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
joep van der velden 5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden 34ef0922d2 EMPed flashes now don't runtime 2020-02-03 22:58:34 +01:00
Aquilar fa84366203 Added an icon to differentiate the blueprints from the CE's blueprints. purely to prevent confusion.
Fixed the pinpointer from pointing to cyborg and slime blueprints by;
Changing the steal objectives to require the CE's copy of the blueprints exclusive. Which required changing few lines in various places that reference that specific copy.

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

missed the line in photography.dm
2020-02-01 19:06:03 +08:00
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Luca 7b66b31f10 made IPC capital, added return statement, and deleted usless taost comment. 2020-01-10 13:44:46 +11:00
Luca 3f89a00415 Adds IPC plushie and toast, toast is made via IPC plushie. 2020-01-09 17:59:34 +11:00
SteelSlayer b015fbd163 Adds an alt-click shortcut for opening storage items 2019-12-29 21:30:08 -06:00
SteelSlayer ddeae21a12 Adds circuit flooring to the floor painter 2019-12-28 06:14:09 -06:00
Darkmight9 c5ee1c68dd Increases bag space of ERTs and death squads 2019-12-27 18:59:07 -05:00
SteelSlayer 84271962fe Internals activation QoL tweak 2019-12-26 05:04:41 -06:00
Lumiandvariableundefined e6090ea530 Adds vox-themed plushie. (#12745) 2019-12-17 22:32:24 -05:00
Crazy LemonandGitHub cc72b2fa5e Merge pull request #12811 from Kyep/link_update_2
Domain link updates 2
2019-12-16 19:55:08 -08:00
Crazy LemonandGitHub bd9f26e264 Merge pull request #12731 from Cazdon/miniMedsBranch
Rolls of Gauze and Ointments now heal 10 brute or burn respectively.
2019-12-16 19:16:23 -08:00
Kyep fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
Darkmight9 f3ad67bd73 Changes the spray bottle in the full janitor belt to one with space cleaner in it 2019-12-12 17:27:52 -05:00
unknown a071b23ff9 Made gauze and ointment heal for 10 brute or burn respectively. 2019-11-14 20:30:23 -05:00
moxian 1d0b84addb Fix prisoner implant z-level checking.
- Can no longer hide in a locker from prisoner computer tracking
- locator no longer tracks implanted people across z-levels
2019-11-09 10:17:41 +00:00
Mars f2f7ec956a Orderable conscription kit only without ID 2019-10-31 15:43:35 +01:00
moxian 6520b32e56 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.
2019-10-31 03:42:04 +00:00
moxian 4fab6f14e6 Add comment on why (I think) the stack fix happens to work. 2019-10-28 10:34:47 +00:00
moxian a24013be5b Fix stacks being consumed by redspace.
Fixes #12606
2019-10-28 10:21:06 +00:00
Darkmight9andvariableundefined 19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -04:00
Evankhell561andvariableundefined af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloudandvariableundefined 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloudandvariableundefined 393b248835 Removes Ancient Storage Codersprite (#12594) 2019-10-27 00:22:12 -04:00
TDSSSandvariableundefined 76ab2c7700 Makes yellow documents destructible (#12540) 2019-10-27 00:19:40 -04:00