Commit Graph

63 Commits

Author SHA1 Message Date
AffectedArc07 55387c7927 Adds appropriate attribution to nanomap rendering (#13878) 2020-07-21 03:38:24 -06:00
AffectedArc07 9ff59fcc0f Merge branch 'master' into nanomaps-github-action 2020-07-01 15:42:53 +01:00
AffectedArc07 58aa86cb9f TGUI-V3 (#13310)
* I need that gitignore file

* Temp Commit - DOES NOT COMPILE

* THE SHIT WORKS

* Readme change

* Disposal Unit --> TGUI

* mmmm yes CI which may not actually work

* New GitIgnore

* ITS TGUI-NEXT BABY

* Doc update

* CI tweak

* Chmod

* And again

* *sigh*

* Lets appreciate the irony of me failing CI stages

* 0/1 --> True/False

* Fixes some update nonsense

* CI Update

* Lets try this

* What about this maybe

* NVM is hurting me

* I swear to god

* A little bit of validation in my life

* V3 BABYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY

* Fixes

* Fixes NaN appearing for a few frames when UIs open

* Fixes + Crew Monitor

* Corn + Steel + Mochi Fixes

* Forgot this

* Fixes from stylemistake

* Code Change

* Adds logout proc

* Offline implications + Resizeable crew monitor

* Change locate() to locateUID()

* Change div --> box
2020-06-30 03:51:36 -04:00
AffectedArc07 0c8d95dd65 Travis Update Finale: Unit Tests + SQL Validation (#13331)
* SQL Validation, the first of many

* Initial test of the world loading

* This was prefixed when it shouldnt have been :v

* This also isnt a valid table

* Escape time

* Chmod

* This **should** work

* Oops

* RUST gone bust

* Please work

* Why did I do this twice

* I think I got it

* Fixes AFK SS

* AAAAAAAAAAAAAAAAAAAAAA

* Fixes AI cam runtime

* Cleanup

* *screams*

* Fare fixes

* Removes un-needed stuff

* I hope this works

* chmoooood

* SQL Version Unit Test

* Failure test

* Kinda ironic how I forgot this

* Task failed successfully

* Moves a global var around

* Bump SQL version in travis

* New test: SQL example DBconfig update

* Lets test an invalid version

* TASK FAILED SUCCESSFULLY

* Programmatic maplist generation

* Removes a duplicate check

* Lets try this

* What about this

* hnnng

* Lets just update BYOND
2020-06-27 01:26:58 -06:00
AffectedArc07 c76a519eaa GitHub action for NanoMap generation
Number 1

Number 2

Number 3

God I wish there was a decent way to test these

AAAAAAAAA

Begin the null diffs

Oh ffs wrong branch

chmod

Forgot to mod the renderer itself

Number 23452354235

It just keeps going

I think this might be it

Lets try that again

aaaaaaaaaa

*scream

*sigh

Dont tell me that a newline broke it

...

aaaaaaaaaaaaa

*scream

This worked

THATS WHAT KILLED IT?!?!?!?!?!?!?!?

...

I THINK ITS READY

Ok final commit

Line endings are the bane of my existence

This has really made me feel stupid

CRLF AAAAAAAAAA

Changes DM side
2020-06-11 12:27:21 +01:00
AffectedArc07 7ea6f190c5 Changelog Overhaul (#13051)
* Changelog Overhaul

* SQL Update

* This is why I hate merge conflicts

* Comment Correction

* Farie Fixes + Tested with blank DB

* Colours + Titles

* Colour tweaks

* I fell victim to my own CI Chains!

* Cleans up the remains of the old changelogs

* Fixes formatting

* Kyet Changes

* Date
2020-05-18 01:34:28 -06:00
AffectedArc07 b65030fec5 I need to learn to read my todos 2020-05-05 10:13:01 +01:00
AffectedArc07 e009686904 Argh 2020-04-12 14:40:09 +01:00
AffectedArc07 6fe57bc988 Oops 2020-04-12 14:33:11 +01:00
AffectedArc07 d992ef5008 Test of the travis cleanup 2020-04-12 14:23:37 +01:00
AffectedArc07 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
Kyep 22977cac15 Fixes MapMerge Requirements (#13257)
* pygit 1.0.1

* Pillow 7.1.1

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-04-09 23:24:22 -06:00
AffectedArc07 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
AffectedArc07 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
dependabot[bot] 26c45be670 Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2
Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.1.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/5.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-22 22:33:21 +00:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Kyep 5dbaa06661 Updates changelogs Apr08->May02 2019-05-02 20:56:00 -07:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud 7d423acc61 Implements Newer Version of Mapmerge 2019-03-17 22:46:24 -04:00
variableundefined bcc6063926 Merge pull request #10978 from AffectedArc07/mapmerge2-again
Mapmerge2 2
2019-03-09 17:04:11 +08:00
AffectedArc07 433a22bb81 Mapmerge2-2 2019-03-03 01:02:32 +00:00
AffectedArc07 8ecb6cab78 Appveyor CI 2019-03-02 09:54:25 +00:00
Superhats a275d91fef let's unfuck those sprites 2018-08-28 19:33:02 +02:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000 95e0b80fb9 Merge pull request #8353 from Ty-Omaha/midi
Adds TG's update of midi2piano
2017-11-10 10:14:04 -08:00
Ty-Omaha 2e1284b268 Keeps old one and adds new one as another option 2017-11-06 04:59:14 -05:00
Ty-Omaha 7ed3d4f5f2 Replaces everything 2017-11-06 04:28:07 -05:00
msgerbs 974048cd04 Update map merge instructions
Documentation!
2017-10-13 20:32:18 -05:00
Crazylemon64 a41e189521 picky nit 2017-03-23 05:13:07 -07:00
Crazylemon64 22eaacabeb Plagiarizes map conflict fixer to make icon conflict fixer
I hate icon conflicts
2017-03-22 23:35:57 -07:00
Crazylemon64 cfac90590a One last bit to make it all work 2017-01-18 21:49:45 -08:00
Crazylemon64 b9ad3116eb Adds a slightly modified batch script
For running it in DMM mode
2017-01-18 21:07:00 -08:00
Crazylemon64 16723535cd Adds my own tweaks to the map conflict fixer
No longer always converts to tgm
2017-01-18 21:04:25 -08:00
Crazylemon64 d945229fcb Ports over tg's map conflict helping script 2017-01-18 20:27:00 -08:00
Alffd a4f19cb4b3 Fixes issues with CL unicode, adds Fox's last unicode changelog. 2016-11-27 15:47:16 -05:00
Crazylemon64 014ddc3108 Renames instruction file, removes obsolete mapmerge driver bit 2016-04-12 10:37:14 -07:00
Crazylemon64 894cc7b8d4 Sure, it took all of 5 minutes 2016-04-12 10:16:33 -07:00
TheDZD 16bf5d8970 Ports changelog system from /tg/station and updates Travis
Travis update is a port of Baystation12/Baystation12#10096
2016-01-04 21:53:58 -05:00
Tigercat2000 65421fb316 Update mapmerge to -tg-'s latest 2015-12-13 09:27:53 -08:00
Markolie d8f98d6082 Add dmisort.sh script, and sorts all icons in .dmi files 2015-09-17 01:08:58 +02:00
Markolie 0244ad2309 Add the dmitool (from Bay) 2015-09-17 00:20:12 +02:00
Fox-McCloud 1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Tigercat2000 27d56bdab1 Update gitignore and mapmerge for tgstyle maptree
This commit updates the .gitignore file to ignore the proper files with
the new tree system, and modifies the mapmerge files to the latest -tg-
files, as those are already compatible and written for the new tree
system.
2015-05-11 16:03:07 -07:00
W3bster 38b2577276 Map Changes
-Complete rework of viro wing.
-Modified toxins mixing walls for a higher temp resistance.
-Changed pipes in atmos to fit the distro and waste system upon request
of Bone White.
-Moved flora labs to fit more xenobio and feel less rejected.
Added more security to get in viro with disinfection tools (shower,
sink)
http://puu.sh/b2Or6/90ae34d67a.png
http://puu.sh/b2xKu/551c71fde6.png
http://puu.sh/b2xJr/b2fa3acb73.png
2014-08-30 12:22:00 -04:00
iamgoofball 4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
W3bster d194ff04be Tools, map fixes and add-ons
-Pipe freezer in engi storage and atmos
-Pipe painter in engi storage
-Fixed ERT access issues

-MapMerger tool for mappers
-Various tools for coders
-Midi2piano for users (Convenience)
2014-08-12 00:16:30 -04:00
ZomgPonies 057ed20173 Yeah fuck this tools folder, installed BYONDtools directly into python instead. 2014-06-21 05:33:32 -04:00
ZomgPonies 3d742adb94 Revert "For some reason this keeps disappearing"
This reverts commit 6feabc0249.
2014-06-21 05:20:25 -04:00
ZomgPonies 6feabc0249 For some reason this keeps disappearing 2014-06-21 05:17:42 -04:00
ZomgPonies cf061cb953 Bunch of fixes left and right, fixes script to get giant map jpg 2014-05-29 21:40:16 -04:00