cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,341 Commits 74 Branches 23 Tags
e67cfbe2de5be63fda60ab93aaa5419dec72fd06
Commit Graph

637 Commits

Author SHA1 Message Date
alberyk
e67cfbe2de Fixes a lot of stuff 2022-02-10 15:04:07 -03:00
alberyk
beecb5f802 Merge branch 'master' into fourth_week_preparation_and_fixes 
# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm
 2022-02-10 13:36:46 -03:00
Alberyk
f42edd018e Adds more customization to robotic internal organs but it is not broken (#13068) 2022-02-06 18:07:42 -03:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
Matt Atlas
3225711e67 Revert "Adds more customization to robotic internal organs (#12994)" (#13065) 2022-02-02 19:46:57 +01:00
Casper3667
567da024d0 fixes people being unable to play as NT (#13064) 2022-02-02 19:35:58 +01:00
Sparky
e946d0b704 Zeng-Hu First Responder Coat (#12936) 2022-02-02 17:27:48 +01:00
Alberyk
a32ce7644e Adds more customization to robotic internal organs (#12994) 2022-02-02 13:07:11 -03:00
Casper3667
f08f84adfb Adds lot of new skrell uniforms (#13015) 2022-02-02 17:01:09 +01:00
listerla
41d95db508 Adds a pair of human lore-related book items (#12903) 2022-02-02 17:00:21 +01:00
Casper3667
1d309ef966 Fixes the ability to join a job as the wrong faction (#13059) 2022-02-02 16:47:35 +01:00
alberyk
f4a18401d1 access and more 2022-01-30 12:54:01 -03:00
alberyk
cd07daa559 Merge branch 'master' into prepare_stuff_for_second_week 2022-01-29 11:45:45 -03:00
Casper3667
edb1c08178 Adds the zeng-hu jargon division cloak and a custom item (#12931) 
Co-authored-by: TGW <mc-casper@hotmail.dk>
 2022-01-29 01:07:36 -03:00
Geeves
ce1f702435 Misc Fixes 2022-01-23 00:49:40 +02:00
alberyk
9615a17ecc loadoutfixes 2022-01-22 12:36:12 -03:00
Wowzewow (Wezzy)
00a0a84984 Seethrough blindfolds actually seethrough again. (#12909) 2022-01-22 13:17:46 +01:00
alberyk
1b42a98f4a sanity fix 2022-01-21 23:58:41 -03:00
alberyk
1dc3bb2dd8 Merge branch 'master' into final_shuttle_touches_and_stuff 2022-01-14 21:04:38 -03:00
alberyk
ffc66111e5 uniform 2021-12-29 23:19:44 -03:00
Casper3667
951e9b95f1 adds a new vest to the loadout (#12844) 2021-12-24 02:59:03 -03:00
Wowzewow (Wezzy)
25f4df810f Chair fixes again (#12866) 
* Chair fixes 3

fixes wheelchairs not being able to be picked up...again

* japed
 2021-12-22 13:03:16 -03: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
Wowzewow (Wezzy)
0549da254f Business card buffs (#12810) 
* bizniz cards

* Buffs business cards.

* Update wezzy_businesscardbuffs.yml

* oops

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* fix

* Update wezzy_businesscardbuffs.yml

* makes business cards unfoildable and glass immune to fire

* KOLORS

* spy fortress 2

* dent

* A

* undoes purse change

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
 2021-12-19 22:22:28 +01:00
desven
016306cb38 code (#12737) 
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
 2021-12-19 22:10:29 +01:00
Casper3667
7475c49d65 Adds hairnets (#12860) 
* adds hairnets

* description change

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
 2021-12-19 22:09:58 +01:00
Wowzewow (Wezzy)
527698d6a8 Updates wheelchair code for the new chair-lennium. (#12813) 2021-12-07 13:52:58 -03:00
Casper3667
d87b08c457 adds the qeblak mantle to the skrell loadout (#12806) 
* adds the qeblak mantle to the skrell loadout

* changelog

Co-authored-by: TGW <mc-casper@hotmail.dk>
 2021-12-05 23:44:17 +01:00
Casper3667
5cad105579 Makes neck bandannas into accessories (#12787) 2021-12-02 22:56:59 +01:00
Geeves
d4ffc624f3 Toggling Headgear Hair Blocking (#12759) 2021-11-21 21:03:30 +01:00
Forester40
04e338c5e4 Reopens Adds IAC berets to the loadout (#12713) 
* Add files via upload

* changelog
 2021-11-05 10:52:09 -03:00
Casper3667
ebeafd7617 Adds idris labcoats (#12684) 2021-11-02 14:10:22 -03:00
Casper3667
fbbdbb21b9 fixes the faction loadout display & spawn (#12708) 2021-11-01 15:09:43 -03:00
Alberyk
3940c6a044 Adds nymph-limbs: The Return (#12374) 2021-11-01 00:13:15 -03:00
desven
b9d49444ab Some Vaurca Breeder selection fixes (#12707) 2021-10-31 23:46:09 -03:00
desven
c7475c96a3 Even more Bulwark sprites and fixes (#12687) 2021-10-30 13:56:48 +02: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
alberyk
76544b9cd8 rename 2021-10-29 21:23:43 -03:00
desven
3b93f8c710 Readds the normal leather satchel to the loadout, adds normal wallet to the loadout (#12638) 2021-10-29 17:28:18 +02:00
Alberyk
d5ee7167e5 Renames the dionae subspecies also gives them hair (#12693) 2021-10-27 23:15:15 -03:00
Alberyk
694577960f Adds a new dionae subspecies (#12649) 2021-10-27 13:48:08 -03:00
Casper3667
5b91d636f3 adds EPMC labcoats (#12632) 2021-10-20 00:09:30 +02:00
Casper3667
80b2da13ff adds starlight residency cards to skrell (#12643) 2021-10-19 18:39:42 -03:00
Casper3667
9133ddff93 adds several new coffee cups (#12627) 2021-10-17 20:44:41 -03:00
Geeves
d6e48e4431 Recolorable White-Tip Sneakers (#12617) 2021-10-16 11:59:25 -03:00
Geeves
2bf8b5c4dd Bulwark Loadout Fix (#12634) 2021-10-15 20:32:16 -03:00
TheDanseMacabre
d0a34bce44 Visegradi Flavor Items (#12609) 2021-10-15 08:45:46 +02:00
Casper3667
247d12e600 fixes skrell loadout for axiori (#12606) 2021-10-13 01:35:04 -03: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
Casper3667
c86de6b84c Adds tajaran charms to the loadout (#12576) 2021-10-06 19:09:42 -03:00