cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,505 Commits 74 Branches 23 Tags
2da40e525e7c56f19949c5ec6e1b97ae8b100afd
Commit Graph

458 Commits

Author SHA1 Message Date
Zuhayr
2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
PsiOmegaDelta
dbbb5d2e86 Merge pull request #11650 from Baystation12/dev-freeze 
Dev
 2015-12-10 08:29:06 +01:00
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master 
Dev-freeze
 2015-12-10 08:21:43 +01:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
PsiOmegaDelta
12b9d30923 Gear loadout sanity checking. 
Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'.
 2015-12-09 12:27:41 +01:00
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
PsiOmegaDelta
079ea9ad9a Merge remote-tracking branch 'upstream/dev' into 151205-MoreCharacterSetupOptions 
Conflicts:
	code/modules/client/preferences.dm
 2015-12-06 12:15:04 +01:00
GinjaNinja32
92a1f1a016 Merge pull request #11590 from PsiOmegaDelta/151204-SaveMyCharacter 
Can now load/save/reload while readied.
 2015-12-05 18:59:19 +00:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
PsiOmegaDelta
5c8516e2b7 Transfers language shortcut keys from per character setting to a global one. 2015-12-05 13:01:51 +01:00
PsiOmegaDelta
fefa400604 Changes the character setup update flow. 
Changes the way savefile version upgrades are done, letting each sub-setting handle it own upgrade path, while also making it easier to transfer settings between preferences and individual characters save slots.
 2015-12-05 12:03:34 +01:00
GinjaNinja32
7ce8f42e11 add verbs to allow players to spin their view 2015-12-05 10:42:00 +00:00
PsiOmegaDelta
9b6b5ad4b3 Can now load/save/reload while readied. 
The load window also no longer pops under the character setup screen.
Just some small character preference QoL changes.
 2015-12-04 11:43:25 +01:00
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Zuhayr
0b8125d30b Added boot knives and putting a knife in your boot. 2015-12-01 02:05:29 +10:30
Kearel
5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
PsiOmegaDelta
89e85925c9 Merge pull request #11516 from Baystation12/dev-freeze 
Dev
 2015-11-24 14:35:56 +01:00
PsiOmegaDelta
e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
Bjorn Neergaard
0f78998377 Fix Dionea home system 
Fixes #11492
 2015-11-22 20:34:29 -06:00
Kearel
4f241fd22c Reworked Orion Trail 
Plays a bit differently. Slightly more challenging but still beatable
with proper strategies in use.
 2015-11-22 20:23:31 -06:00
PsiOmegaDelta
033708b8e6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-19 09:06:32 +01:00
PsiOmegaDelta
aa3a62fe32 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-19 08:59:24 +01:00
GinjaNinja32
d247584d1b add a sleep inbetween disabling and enabling hardware mode 
i've been seeing HW mode not always re-enabling, hopefully this'll fix it
 2015-11-18 14:38:46 +00:00
Kearel
a8406f018b Adds Entertainment Items 
Adds the following:
Actor Guild for ghosts to spawn at.
Board for playing board games.
Two trading card games with booster packs.
Tarot cards.
Cargo can now supply lasertag equipment as well as decks/booster packs
 2015-11-12 23:24:34 -06:00
GinjaNinja32
7c1fb1fde9 Merge pull request #11442 from PsiOmegaDelta/151111-CharacterSetupTweaks 
Character setup tweaks.
 2015-11-13 05:05:32 +00:00
PsiOmegaDelta
e40246e9df Character setup tweaks. 
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433.
 2015-11-11 13:50:22 +01:00
PsiOmegaDelta
4ab55646a6 Cleaner mouse death. 
Mouse that go splat now call death() instead of doing partial death handling.
When one wishes to join as mouse timeofdeath is checked, instead of a snowflake var.
 2015-11-08 13:03:02 +01:00
Chinsky
5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup 
Character setup refactor.
 2015-10-26 05:44:13 +03:00
NullSnapshot
00e0014a3f fixes #9962 2015-10-25 17:52:49 -07: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
mwerezak
7272deb5ae Fixes #11216 
Sunglass-derived custom gear is now only available to roles that normally have access to them.
 2015-10-15 06:58:25 -04:00
PsiOmegaDelta
8421058ece Adds language prefix reset option. 
Allows you to reset the language prefix key to the server defaults. Mostly a convenience thing.
Adds missing reserved say character.
 2015-09-18 21:42:02 +02:00
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
Zuhayr
ef21f562fd Added some Resomi uniforms/loadout options. 2015-09-06 18:49:33 +09:30
Zuhayr
63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys 
Languages now use alternative prefix keys.
 2015-09-06 17:20:51 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr
12a5c47413 Added a proper cooldown on latespawn, added loyalist role to char setup. 2015-09-05 10:46:23 +09:30
Zuhayr
0a355c84a3 Added species checks for robolimb use. 2015-09-04 08:55:27 +09:30
PsiOmega
5873026915 Adds missing message assignment. Removes now unnecessary message formatting. 2015-08-27 19:35:44 +02:00
PsiOmegaDelta
85f32efa7a Players can now select their own language shortcut keys. 2015-08-26 15:15:54 +02:00
PsiOmegaDelta
5962656c1e Languages now use alternative prefix keys. 
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
 2015-08-26 13:17:57 +02:00
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
 2015-08-21 20:27:48 +02:00
PsiOmega
d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-21 18:59:19 +02:00