Commit Graph

2664 Commits

Author SHA1 Message Date
Zuhayr b2ab041c3f Added checks for character age to numerous jobs. 2015-12-11 15:07:28 +10:30
PsiOmegaDelta c4d6a76887 Merge pull request #11649 from Baystation12/master
Dev-freeze
2015-12-10 08:21:43 +01: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
Neerti 894ad58277 Fixes people spawning in space.
People were spawning in space due to a runtime error that occured when they choose the orange scarf, because the loadout entry lacked a path variable.
2015-12-09 02:50:51 -05:00
SinTwo 897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05:00
Mark9013100 457c40d46f Fixes #448 and #401, custom loadout edit. 2015-12-06 06:26:06 -05:00
Neerti c808371780 Merge pull request #444 from Neerti/12/4/2015_communicators
Adds cellphones!
2015-12-05 17:37:35 -05:00
Neerti 3e946447a3 Adds cellphones! Details in the changelog entry. 2015-12-05 17:26:13 -05:00
GinjaNinja32 944b1255e4 add verbs to allow players to spin their view 2015-12-05 10:52:29 +00: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
SinTwo 700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
Jon 36755f077c Removes the Resomi clothing from the custom loadout to prevent confusion as we're not intending to have Resomi crew, to my knowledge. 2015-11-27 16:58:48 +00:00
Neerti 78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05: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
Neerti b635a64530 Fixes socks. Again. For the third time. 2015-11-20 08:50:30 -05:00
PsiOmegaDelta df0188662c 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.

(cherry picked from commit e40246e9df)
2015-11-20 07:50:12 -05:00
PsiOmegaDelta e715c16093 Character setup refactoring.
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.

(cherry picked from commit e116721977)

Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	polaris.dme
2015-11-20 07:46:31 -05: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
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti f3c1be4241 Fixes socks and preview icon. 2015-11-06 23:20:50 -05:00
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05: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
SinTwo a2b24d64b7 TG_Port_2
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
2015-10-11 00:36:13 -04:00
Jon de2ee16588 Fixes issues with incorrect loadout ids 2015-10-11 00:26:57 -04:00
Jon 9f2ec9c163 Adds three new hair flower pins - yellow, blue, and pink.
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
Neerti 2cc8dbbe18 Fixes savefile issue. 2015-10-11 00:24:48 -04:00
Neerti bbe8c336b2 Adds socks.
Conflicts:
	code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -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
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
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