Commit Graph
594 Commits
Author SHA1 Message Date
Fox McCloudandGitHub c87e4bd5c7 Merge pull request #12950 from Aquilar/blueprintpinpointerfix
Fixes steal station blueprints objective
2020-05-01 18:36:08 -04:00
AffectedArc07andGitHub 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
Ty-OmahaandGitHub e691ea2b36 Paper Letterhead (#13155)
* fax letterhead 1

need to add correct paperbins on map and resize logos

* tweaks

* syndicate paper on syndicate base

* code improvements
2020-03-21 17:17:03 -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
Aquilar 898ca53e71 deconflict
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-18 15:09:43 +08: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
AffectedArc07andGitHub 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloudandGitHub 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
Fox McCloudandGitHub df2c35d4c1 Merge pull request #12698 from moxian/colorblind-photo
Make photos look the same as reality to colorblind people.
2020-03-07 18:42:39 -05:00
AffectedArc07 a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00: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
AffectedArc07andGitHub 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00: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
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
moxian a9c19ebb6b Make paperwork popups use UID as a window id. 2019-11-06 04:40:16 +00:00
moxian c37ed36b59 Make photos look the same as reality to colorblind people. 2019-11-05 07:27:04 +00:00
Fox McCloudandvariableundefined 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloudandvariableundefined 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
variableundefinedandGitHub 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud 67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04:00
Fox McCloud 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
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud 42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud 0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefinedandGitHub 1dc8e66cbc Merge pull request #11772 from Couls/constructable-rechargers
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
variableundefinedandGitHub a42226c112 Merge pull request #11691 from TDSSS/lavaland-fax
Gives lavaland syndie base a fax (+some small other changes)
2019-08-23 08:33:04 -04:00
Fox McCloudandGitHub a0203a60ac Merge pull request #11965 from TDSSS/talisman-icons
Give cult talisman different icons
2019-08-14 19:48:54 -04:00
TDSSS ee79fc139e Made update icon less stupid 2019-08-06 01:52:10 +02:00
TDSSS bbef99ce61 Give cult talisman different icons 2019-08-05 23:01:01 +02:00
Couls 268881de5c Merge remote-tracking branch 'upstream/master' into constructable-rechargers 2019-08-04 21:11:21 -04:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
variableundefinedandGitHub d84d2a0b55 Merge pull request #11562 from Tayyyyyyy/markdown
Support markdown in papers
2019-07-08 20:20:46 +08:00
TDSSS fe297fbd93 incorporated kyet's desired changes 2019-07-01 13:07:10 +02:00
Couls cf31a774a5 Rechargers can be built now
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
TDSSS d5af92d346 Initial commit 2019-06-06 14:12:44 +02:00
Mark van Alphen ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
2019-05-23 19:04:09 +02:00
tayyyyyyy 066343ad31 Support markdown 2019-05-21 13:49:51 -07:00
Fox McCloudandGitHub d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit
Fixes paper.dm issue
2019-05-18 16:26:57 -04:00