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
28,875 Commits 74 Branches 23 Tags
afd526126d8f4d4e36a42b51fa9cfbc6bea18f14
Commit Graph

646 Commits

Author SHA1 Message Date
Mustafa Kalash
73436d6cfd Fixes another problem with be75349. Should be for real this time. 2016-01-01 16:31:04 -05:00
Mustafa Kalash
6e23584e69 Fixes #11776. Fixes error in be75349. 2016-01-01 16:20:02 -05:00
Mustafa Kalash
be753497d0 Fixes #11801. 2016-01-01 15:35:17 -05:00
Loganbacca
b94fa98170 Tweaked a couple of fixes 2015-12-29 16:41:59 +13:00
Loganbacca
358a85a179 Preview icon fixes 
- Fixes preview icon not updating with skin/hair/eye colour, and underwear selection
 - Fixes bug causing blank underwear and undershirt selection after randomizing
 2015-12-28 21:25:14 +13:00
Zuhayr
b6984d9a20 Added checks for character age to numerous jobs. 
Conflicts:
	code/game/jobs/job/assistant.dm
 2015-12-22 13:24:12 +01:00
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
 2015-12-13 10:47:33 +01:00
Chinsky
e89eae05bb Fixes #9197 2015-12-12 14:23:00 +03:00
PsiOmegaDelta
a32be3f359 Adds the ability to have random lobby screens. 
A random lobby screen is now picked at server start, and presented to all players. Sadly in our case we currently only have one every day lobby screen.
Port of https://github.com/PolarisSS13/Polaris/pull/321, with added sanity checking.
 2015-12-01 15:55:18 +01:00
Chinsky
5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup 
Character setup refactor.
 2015-10-26 05:44:13 +03:00
PsiOmegaDelta
e116721977 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
 2015-10-18 17:34:35 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04:00
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04:00
PsiOmega
e0951b1cf9 has_admin_rights() improvement. 
Now calls the check_rights() proc, which handles all checks for us.
 2015-09-27 17:05:15 +02:00
PsiOmegaDelta
dcc4655026 Merge pull request #11112 from caelaislinn/missing_spawn 
QOL feature for mappers
 2015-09-17 21:11:52 +02:00
Cael Aislinn
00c9402656 enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-16 12:48:37 +10:00
GinjaNinja32
30782cde8f Remove the need to map in the title screen, move title screen icons into a single file 2015-09-12 08:34:28 +01:00
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
Matthew951
78a129db9d Adds a new set of hair and facial hair 
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
 2015-08-27 14:47:02 -04:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
HarpyEagle
651c2c6ba6 Species spawn_flags 
Moves some more species flags into a new spawn_flags var.
 2015-08-18 17:02:45 -04:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
PsiOmegaDelta
db565ae2ff Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery 
Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm
 2015-08-13 08:11:32 +02:00
Chinsky
f7ccf47f06 Merge pull request #10030 from GinjaNinja32/languages 
Reworks character creation language selection
 2015-08-13 07:23:44 +03:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
Mloc
f04ca77bfb revert chargen rendering rework 
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-08-01 11:35:53 +01:00
PsiOmegaDelta
9e46dfbb56 Re-arranges data record and crew arrival announcement code. 2015-07-28 11:27:44 +02:00
PsiOmegaDelta
df83203356 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/hydroponics/seed_mobs.dm
	code/modules/materials/materials.dm
 2015-07-09 08:45:49 +02:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master 
Dev-freeze
 2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7 Emergency workaround for the observer bug. 2015-07-09 11:01:42 +09:30
GinjaNinja32
57bdcf43b6 Reworks character creation language selection 2015-07-06 10:07:35 +01:00
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
Chinsky
9d03286b6c Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon. 2015-06-25 23:04:33 +03:00
PsiOmegaDelta
e669c1ab7c Merge pull request #9687 from comma/dev 
Fixes organs self-rejecting
 2015-06-10 09:39:43 +02:00
PsiOmegaDelta
81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master 
Dev-freeze
 2015-06-08 09:56:24 +02:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles. 
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
 2015-06-07 12:31:55 -04:00