cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,696 Commits 74 Branches 23 Tags
22cb455e1645795069ac3da9c35b6f673febb51a
Commit Graph

148 Commits

Author SHA1 Message Date
WickedCybs
e944b2ca85 Removing Meteors/Debris From the Random Event Rotation (#14268) 2022-06-25 22:11:57 +02:00
mikomyazaki
a7b53a1146 Adds a mapmerge2 script set for the horizon map (#13496) 2022-04-16 21:32:52 +02:00
alberyk
8c1d2a7cde Merge branch 'master' into final_away_maps_additions 
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
 2022-04-04 19:47:58 -03:00
mikomyazaki
25dc59083c Removes Exodus map (#13305) 2022-03-12 02:03:38 +01:00
dependabot[bot]
822c45ba25 Bump pillow from 9.0.0 to 9.0.1 in /tools (#13375) 2022-03-12 02:01:04 +01:00
alberyk
f0e32eec35 Merge branch 'master' into ship_and_stuff 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
 2022-03-04 14:00:19 -03:00
dependabot[bot]
e96c94037b Bump node-fetch from 2.6.1 to 2.6.7 in /tools/vueui-report (#12998) 
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-03 17:34:12 +01:00
alberyk
cd07daa559 Merge branch 'master' into prepare_stuff_for_second_week 2022-01-29 11:45:45 -03:00
dependabot[bot]
143553856a Bump pillow from 8.3.2 to 9.0.0 in /tools (#12910) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-22 23:53:43 +01:00
alberyk
4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff 
# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
 2021-12-21 16:51:40 -03:00
Karolis
32f6b49820 VueUI actions and things using GitHub Actions (#12830) 2021-12-19 21:01:39 +01:00
Karolis
22958e49c4 Replacement github actions (#12857) 2021-12-19 02:10:56 +01:00
alberyk
2294b4f0c5 Merge branch 'master' into computer_tweaks 
# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi
 2021-10-29 21:41:30 -03:00
Werner
555649b8a8 CI: Fix changelog dependency issue 2021-10-14 21:52:44 +02:00
alberyk
805ffc2f85 Merge branch 'master' into computer_tweaks 
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
 2021-10-10 13:18:14 -03:00
dependabot[bot]
2bfdf1dab4 Bump pillow from 8.2.0 to 8.3.2 in /tools (#12472) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [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/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-25 20:24:42 +02:00
Werner
92d164ac09 Merge branch 'upstream-master' into placeholder 2021-09-07 00:00:37 +02:00
dependabot[bot]
3d354799c8 Bump path-parse from 1.0.6 to 1.0.7 in /tools/vueui-report (#12335) 2021-09-04 20:48:47 +02:00
Alberyk
f5548eb5e3 Merge branch 'master' into updates_stuff 
# Conflicts:
#	code/game/objects/structures/window.dm
 2021-08-04 23:08:28 -03:00
Sparky
ade38510fe Removes Random Golems (#12287) 
habemus revert
 2021-08-05 01:34:17 +02:00
Erki
9eb663da66 Merge branch 'master' into newmap-master 
# Conflicts:
#	aurorastation.dme
 2021-07-13 22:19:58 +03:00
Geeves
27944fb32d Non-Hostile Migrations and Angry Goats (#12016) 2021-06-21 18:11:54 -03:00
dependabot[bot]
4f8fdb79fa Bump pillow from 8.1.1 to 8.2.0 in /tools (#12017) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.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/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-16 11:14:36 +02:00
dependabot[bot]
c22f049fa5 Bump ws from 7.4.1 to 7.4.6 in /tools/vueui-report (#11982) 
Bumps [ws](https://github.com/websockets/ws) from 7.4.1 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.1...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-16 11:14:18 +02:00
Ferner
5fc38a01e8 Merge branch 'master' into placeholder 2021-04-10 19:20:48 +02:00
dependabot[bot]
fa3a04e52f Bump pillow from 8.0.1 to 8.1.1 in /tools (#11481) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.0.1 to 8.1.1.
- [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/8.0.1...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 21:13:05 +01:00
Ferner
2468f83158 Merge branch 'master' into placeholder 2021-01-25 12:59:03 +01:00
Erki
ce9d92a17d Fixes the linter 2021-01-22 22:11:57 +02:00
Ferner
c1040c8b25 Merge branch 'master' into placeholder 2021-01-09 20:17:14 +01:00
Karolis
f42430957c VueUI 2 Part 2 - Reporting tool (#10850) 2021-01-09 19:26:42 +01:00
Ferner
85cb7e6b81 Merge branch 'master' into placeholder 
# Conflicts:
#	icons/obj/furniture.dmi
 2020-12-24 17:56:02 +01:00
Geeves
e1deb0a277 Drone Uprising Event (#10766) 2020-12-19 13:59:42 +01:00
MarinaGryphon
64b8b78a3a Fixes #10828 (#10830) 
* Fixes #10828

* fixes log cache

* fixes changelog fix changelog
 2020-12-19 13:57:26 +01:00
Ferner
06294c97da Merge branch 'master' into placeholder 2020-12-07 03:25:15 +01:00
Wowzewow (Wezzy)
7766368069 Replaces DMItool with contemporary /tg/station version. (#10624) 2020-12-04 02:21:40 +01:00
Ferner
ae3318ffe2 Merge branch 'master' into placeholder 2020-11-01 22:58:28 +01:00
Alberyk
442f2f9943 Makes spontaneous appendicitis rarer (#10336) 2020-10-27 00:44:41 -03:00
Ferner
8ef502f1f0 Merge branch 'master' into placeholder 2020-10-13 20:09:30 +02:00
Geeves
d827c5e477 Better Icarus Event (#10048) 
* Better Icarus Event

* more gore ft. ferner

* arrow's request

* update event probabilities excel sheet

* gets rid of some old code

* better ifism
 2020-09-27 01:07:27 +02:00
Matt Atlas
d4666caaac Ports Goonchat from Baystation. (#9635) 
changes:

    rscadd: "Ported a new chat system, Goonchat, that allows for cool things like changing font style, size, spacing, highlighting up to 5 strings in the chat, and DARK MODE."
    rscadd: "Repeated chat messages can now get compacted. You can disable this in goonchat settings."
    rscadd: "You can change icon style to any font on your system."
    tweak: "The game window has been altered a bit to adjust for this."
    rscdel: "Removed skin style prefs as they are no longer used."
 2020-09-24 23:06:04 +03:00
Ferner
49e776b145 Merge branch 'master' into placeholder 2020-07-15 20:52:49 +02:00
Mykhailo Bykhovtsev
6b5b3fc592 Enforcing python version in scripts (#7620) 2020-06-26 11:49:34 +02:00
Ferner
5e2f046aba Initial 2020-06-24 09:29:58 +02:00
Erki
4b327dcfe9 Generates parity between remote auth login chain and the normal login chain (#8802) 
Fixes #8773
Fixes #7895
 2020-05-06 16:15:56 +03:00
Mykhailo Bykhovtsev
7b07d8f2e0 Adding admin verb to load templates(maps) during runtime. (#7674) 2020-01-27 21:51:49 +01:00
Werner
cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Matt Atlas
decc0b14a7 Preparation for 513 (#7677) 
* Preparation for 513

* lentext replacement
 2019-12-18 08:10:16 +01:00
Panter
daf29bf016 Added bash versions of all the map preparing and merging scripts in 'tools/mapmerge2/'. (#6929) 
* Added bash versions of all the map preparing and merging scripts in 'tools/mapmerge2/'.

* Renamed all Linux map preparation bash scripts.

* All Linux map preparation bash scripts now assume the file is being executed from the mapmerge2 directory, making the same assumption the .bat files make.

* The map merge Linux bash script now assumes the script is being run from the mapmerge2 directory, making the same assumption the .bat file makes.
 2019-11-06 18:46:11 +01:00
Karolis
c514fb6d25 updates README. Fixes APCs on camera (#7028) 
No, a description isn't necessary. It allows me to do this, tho.
 2019-09-21 20:29:14 +03:00
Erki
38e4b5d77b Implement "send_link" macro (#6767) 
When to_chat gets converted to a proc, then the construct of to_chat(some, link(url)) will no longer work. Or will produce odd results.

As a result, the send_link macro is now created. Replaced existent instances of the previous construct and added a simple grep check for this as well. It won't catch all, probably, but it'll catch the most common instances.
 2019-07-22 01:22:44 +03:00