93db61665d
Speech bubble refactor and Features ( #13598 )
...
* Speech Bubble Update and Refactor
* OBJECTION
* magistrate too
* args
* clean up and plug in atom say
* better
2020-06-28 14:23:32 -06:00
9f49a42d15
Refactor closet and RCS code. Can't put items in closets on modes other than help ( #13464 )
...
* Refactor closet and RCS code. Can't put items in closets on modes other than help
* Undef
* Styling tweaks
* Github reviews and extra
* glob.machines
2020-06-26 02:24:35 -06:00
2c08ce843f
personal locker fix
2020-06-08 22:33:29 -05:00
973e53be14
nevermind this should go after
2020-06-06 10:04:46 -05:00
158c4e241e
fix
2020-06-06 09:55:09 -05:00
70b46d8aea
Life refactor ( #13471 )
...
* Life Refactor WIP
* part 2
* part 3
* runtime fix
* newlines
* tweaks
* perspective checks
* fixes
* remote view tweaks
* more fixes
* robot fixes
* better updating
* cleaned up icon procs
* less proc call overhead
* performance gains
* more optimization
* shorter lists, removal of unecesary code
* gene OOP and dna styling cleanup
* oops
* axe disabilities
* typeless loop
* various tweaks and fixes
* brain checks
* runtime fixes
* cryo vision fixes
2020-06-03 19:43:30 -06:00
c87e4bd5c7
Merge pull request #12950 from Aquilar/blueprintpinpointerfix
...
Fixes steal station blueprints objective
2020-05-01 18:36:08 -04:00
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
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
a65bb8e1e6
Zap Zap
2020-03-14 15:21:50 -05:00
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00: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
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
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
efb2d3cd5c
fixed 3 UOD bugs
2019-12-11 18:46:42 -05:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
5170f3fbae
the-strength-of-this-world-fades
2019-10-04 19:34:08 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
a97d050f4b
Syringe Refactor. Overhauls Lethal Injection Syringe
2019-09-30 18:25:36 -04:00
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
80bb221891
Adds an ATMOS Holofan Creator to the Chief Engineer's locker ( #12419 )
2019-09-26 16:59:20 -07:00
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
d015c0c2b2
even-still-though-time-itself-be-shattered
2019-09-16 01:35:25 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
4716bdd272
Merge pull request #12053 from Couls/boxing-in-the-90s
...
Fix cardboard box walldash
2019-08-29 20:54:07 -04:00
b1dd4d5496
use fox's code
2019-08-29 20:41:12 -04:00
b75db54b1f
Merge pull request #12015 from SteelSlayer/atmos-QoL
...
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
9f2f9cfa6c
Merge remote-tracking branch 'upstream/master' into ports-tailoring
2019-08-27 18:23:11 -04:00
722df75be4
Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
...
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
0b46603e38
Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
...
Adds a handheld defibrillator to the paramedic EVA closet
2019-08-27 02:40:31 -04:00
eef0bc919d
Implements Tailoring
2019-08-26 17:41:39 -04:00
899eb9c948
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-26 00:11:42 -04:00
9a4834a565
Merge remote-tracking branch 'upstream/master' into hardsuit-helmet
2019-08-25 18:15:10 -04:00
8269bc525e
Merge pull request #11941 from farie82/examine-info
...
Adds tips to certain things + general fixes that for issues I across
2019-08-25 16:53:49 -04:00
e1f4a08c54
Adds hand defib to the paramedic EVA closet
2019-08-25 00:49:02 -04:00
cb6df7092c
Hardsuit Helmets Integration
2019-08-24 18:36:27 -04:00
8715878a67
Fix cardboard box walldash
2019-08-22 16:51:07 -04:00
e0a34a179b
Adds destination tagger to atmos locker
2019-08-17 13:07:35 -04:00
bddc7132c2
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-08-12 16:36:43 +02:00
0ab00bb9ff
More refactor + wrong item used fix
2019-07-29 21:18:42 +02:00
Fox McCloud