cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,929 Commits 94 Branches 23 Tags
5416a95c9db41afb2baeb89f264700a9b01cdc21
Commit Graph
44929 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
N8-ToeGitHubNate
 		5416a95c9d Gives XO their hat in their locker (#16362) 
* gives XO a hat

a hat in time

* I did it again

---------

Co-authored-by: Nate <n8toepotato@gmail.com>
 2023-05-20 15:21:08 +00:00
AuroraBuildBot 68b7a2afc1 "[ci skip] Automatic Build - 2023.05.20.16.29.35" 2023-05-20 16:29:35 +00:00
N8-ToeGitHubNate
 		1e47e921c7 Ion announcement fix (#16360) 
* changes Ion anouncement

fix

* whoops

---------

Co-authored-by: Nate <n8toepotato@gmail.com>
 2023-05-20 15:20:55 +00:00
AuroraBuildBot 1e82b97172 "[ci skip] Automatic Build - 2023.05.20.16.12.21" 2023-05-20 16:12:21 +00:00
GeevesandGitHub 81251d6027 Greimorian Bombardier (#16341) 
* Greimorian Bombardier

* the typo of all time
 2023-05-20 15:18:55 +00:00
AuroraBuildBot 9c42a4e099 "[ci skip] Automatic Build - 2023.05.20.15.54.09" 2023-05-20 15:54:09 +00:00
PirouetteandGitHub 080b88d294 Updated drink descriptions to not reference old names (#16355) 2023-05-20 15:18:37 +00:00
AuroraBuildBot 06452e6537 "[ci skip] Automatic Build - 2023.05.20.15.34.57" 2023-05-20 15:34:57 +00:00
BLUNTFORCE420andGitHub 7810007bb6 Prevents afros from being caught in grinders (#16363) 
* Prevents afros from being caught in grinders

See above

* Afros will no longer get caught in grinders

See above
 2023-05-20 15:18:29 +00:00
AuroraBuildBot 62907dbf0f "[ci skip] Automatic Build - 2023.05.19.20.04.52" 2023-05-19 20:04:52 +00:00
Wowzewow (Wezzy)andGitHub 5735f31150 Custom Item Flag Fixes (#16344) 
* Custom Item Flag Fixes

Fixes #16299

* cteum fix
 2023-05-19 19:14:52 +00:00
AuroraBuildBot 4b760fb7ed "[ci skip] Automatic Build - 2023.05.19.19.47.27" 2023-05-19 19:47:27 +00:00
PirouetteandGitHub f1f29bbc4a Made curry available in lunchboxes (#16356) 2023-05-19 19:14:39 +00:00
AuroraBuildBot b887120a50 "[ci skip] Automatic Build - 2023.05.19.19.31.24" 2023-05-19 19:31:24 +00:00
SnibletGitHubMatt Atlas
 		6848993648 Flavour-only height system no longer gives shells away, but it works now (#16369) 
* the pr

* found more problems

* test fix

* returns

* Update examine.dm

* just about

as opposed to around about

* Update sniblet-sameheightyou.yml

* around instead

just obsessing over wording

* Update code/modules/mob/living/carbon/human/examine.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* like this?

* Update examine.dm

* revert good advice

* Update sniblet-sameheightyou.yml

* Update sniblet-sameheightyou.yml

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
 2023-05-19 19:14:10 +00:00
AuroraBuildBot c853875a2b "[ci skip] Automatic Build - 2023.05.19.18.53.52" 2023-05-19 18:53:52 +00:00
Matt AtlasGitHubMatt Atlas
 		182b3b2948 Kitchen edits (plates & dinnerware). (#16357) 
* Kitchen edits (plates & dinnerware).

* cl

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
 2023-05-19 18:35:23 +00:00
AuroraBuildBot 59cc4b4d52 "[ci skip] Automatic Build - 2023.05.18.23.06.43" 2023-05-18 23:06:43 +00:00
Wowzewow (Wezzy)andGitHub 919a030148 Proper backpack inhand sprites (#16366) 
Nuff' said. For Ramke
 2023-05-18 22:12:04 +00:00
AuroraBuildBot b9db56e3a5 "[ci skip] Automatic Build - 2023.05.18.22.51.20" 2023-05-18 22:51:20 +00:00
Matt AtlasGitHubMatt Atlas
 		be5385a365 Blobs now only spawn with 2 engineers and 10 players online. (#16197) 
Co-authored-by: Matt Atlas <liermattia@gmail.com>
 2023-05-18 22:08:16 +00:00
AuroraBuildBot 8630cb886f "[ci skip] Automatic Build - 2023.05.18.22.33.48" 2023-05-18 22:33:48 +00:00
FluffyandGitHub 3ab88be01d PR Atomizer Tool (#16105) 
* trial one

* knlkj

* L

* L

* dsf

* df

* dafsdfa

* asfsa

* fsdf

* df

* mohar

* moar

* asf

* sighs

* added howto

* more

* gah

* examples

* let's see...

* more

* oopsie?

* doubleoopsie?

* cwd?

* More work

* More work

* More work

* More

* examples and requirements

* More

* More

* Changelog

* Fix requirements

* Fixup

* Added changelog option

* opsie

* more

* gah

* more

* gah

* making pylint happy

* more docstring content
 2023-05-18 22:07:43 +00:00
AuroraBuildBot 0d9a2323aa "[ci skip] Automatic Build - 2023.05.18.22.14.06" 2023-05-18 22:14:06 +00:00
RustingWithYouandGitHub c1bc721a3b Wealth Beyond Measure - The Merchants' Guild Ship (#16295) 
* hegemony merchant ship

* guild mantles

* armory weapons + changelogs

* changelog fix

* cl fix 2

* turf fix

* piping and access fixes
 2023-05-18 21:58:04 +00:00
AuroraBuildBot aef7306704 "[ci skip] Automatic Build - 2023.05.18.17.32.44" 2023-05-18 17:32:44 +00:00
Matt AtlasGitHubMatt Atlas
 		5a9a7a1b44 Chemistry grinders now eject beakers into your hands. (#16349) 
Co-authored-by: Matt Atlas <liermattia@gmail.com>
 2023-05-18 17:15:08 +00:00
AuroraBuildBot 45de05488e "[ci skip] Automatic Build - 2023.05.18.15.23.41" 2023-05-18 15:23:41 +00:00
SnibletGitHubMatt Atlas
 		ecb31f35fd Flavour-only height system no longer gives shells away, also grammar tweaks (#16309) 
* the pr

* found more problems

* test fix

* returns

* Update examine.dm

* just about

as opposed to around about

* Update sniblet-sameheightyou.yml

* around instead

just obsessing over wording

* Update code/modules/mob/living/carbon/human/examine.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* like this?

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
 2023-05-18 15:01:43 +00:00
AuroraBuildBot 6f87b082c5 "[ci skip] Automatic Build - 2023.05.18.15.07.18" 2023-05-18 15:07:18 +00:00
YonnimerandGitHub 24b8555ff0 Fixes the EUM origins (#16359) 
* i forgor

* changelog

* changleog fix (🙏)
 2023-05-18 14:51:29 +00:00
AuroraBuildBot 30579571f2 "[ci skip] Automatic Build - 2023.05.17.12.30.52" 2023-05-17 12:30:52 +00:00
RustingWithYouandGitHub 211fed3836 more weapons for izharshan (#16332) 
* more weapons for izharshan

* random weapon to random civgun
 2023-05-17 11:52:38 +00:00
AuroraBuildBot 90056a6337 "[ci skip] Automatic Build - 2023.05.17.12.10.20" 2023-05-17 12:10:20 +00:00
GeevesandGitHub 69a3cc7c49 Food Stuff (#16333) 
* Food Stuff

* the aussies are ruining my life again
 2023-05-17 11:52:32 +00:00
AuroraBuildBot c4c3ec4ed0 "[ci skip] Automatic Build - 2023.05.16.21.23.03" 2023-05-16 21:23:03 +00:00
RustingWithYouandGitHub a9d5c5adbc Fixes Mictlan accent for Unathi and removes Sol citizenship (#16350) 
* fixes mictlan unathi + lingering sol citizenship

* changelog
 2023-05-16 20:55:31 +00:00
AuroraBuildBot 876a9aac6a "[ci skip] Automatic Build - 2023.05.16.07.31.39" 2023-05-16 07:31:39 +00:00
DreamySkrellGitHubDreamySkrell <>
 		845e12527a Third deck starboard hallway hole (#16224) 
* a

* c

* vacant office door swap

* emcloset to vendor swap

* missing fire alarm

* oops disposals pipe going wrong way

* railing to window for the right side grass so it is symmetrical

* post-merge fix

* med bathroom door

* post-merge areas fix

* colored tiles fix

* uhh

* soap and mirror

* uhh

* areas...

* shutters

* 😩

---------

Co-authored-by: DreamySkrell <>
 2023-05-16 07:12:34 +00:00
AuroraBuildBot f245a47b7f "[ci skip] Automatic Build - 2023.05.16.01.08.25" 2023-05-16 01:08:25 +00:00
RustingWithYouandGitHub 9f42c2d4a8 Dig The Hole, For Not'zar - Miners' Guild Station (#16294) 
* miners guild

Adds a Miners' Guild station

* guild mantle drip and shuttle info

* navpoints and decor
 2023-05-16 00:34:34 +00:00
AuroraBuildBot 84236d8243 "[ci skip] Automatic Build - 2023.05.16.00.50.51" 2023-05-16 00:50:51 +00:00
smellieandGitHub f237ea8309 Antag Dirty Bombs & Bodyhorror Parasites (#16317) 
* dirty bombs & bodyhorror

* clean up + extra flavour

CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore.

* desc. fix, TC tweak, syringe gun kit

* dirty bomb tweaks

radiation remains for as long as advertised (~8mins in an open space)
it also actually leaves behind the green goo now.
 2023-05-16 00:34:10 +00:00
AuroraBuildBot 0a3be0f04c "[ci skip] Automatic Build - 2023.05.14.21.13.32" 2023-05-14 21:13:32 +00:00
GeevesandGitHub 850da8d370 Farseer Tweak (#16268) 2023-05-14 19:18:04 +00:00
AuroraBuildBot 082bdeaa24 "[ci skip] Automatic Build - 2023.05.14.20.57.00" 2023-05-14 20:57:00 +00:00
TheDanseMacabreGitHubDanseMacabre
 		0fe87572ce sneed (#16289) 
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
 2023-05-14 19:17:54 +00:00
AuroraBuildBot 8de9f0dff2 "[ci skip] Automatic Build - 2023.05.14.20.40.58" 2023-05-14 20:40:58 +00:00
SparkyandGitHub dcbf696095 Zeng-Hu Softcaps (#16316) 
Adds the Zeng-Hu softcaps to the loadout. They were in the code, just not there for some reason.
 2023-05-14 19:17:50 +00:00
AuroraBuildBot 23c64aee9c "[ci skip] Automatic Build - 2023.05.14.20.22.35" 2023-05-14 20:22:35 +00:00