Commit Graph

6311 Commits

Author SHA1 Message Date
Neerti c0412094f6 Fixes armor making melee combat utterly useless. 2015-12-02 06:30:20 -05:00
Zuhayr 4487db9c14 Fixes several issues with drones. 2015-12-01 09:38:12 -05:00
Neerti 062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
Also fixes a bug with the auto shotgun causing runtimes.
2015-12-01 03:45:47 -05:00
Neerti dd05d385c5 Adds Mockingjay00's title screen.
Adds a system to randomly pick a title screen for the round.
2015-11-26 11:33:16 -05:00
Jon 782ae235e9 Changes the lobby screen's image name from "Baystation12" to "Polaris". 2015-11-24 20:19:38 +00: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
Neerti dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05: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
mwerezak db59f87cb0 Merge pull request #11424 from PsiOmegaDelta/151106-RuntimeFlashing
Fixes  #11422.
2015-11-06 13:10:24 -05:00
PsiOmegaDelta b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
PsiOmegaDelta e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
PsiOmegaDelta 31536c6a56 Fixes #11422.
There is nothing to see here...
2015-11-06 11:13:31 +01:00
PsiOmegaDelta 73f99a4c01 Secondary diona nymphs now get non-restricted/whitelisted languages on split. 2015-11-05 10:04:00 +01:00
PsiOmegaDelta 5f4af85af9 Refactors diona split code for maximum reuse. 2015-11-05 08:15:10 +01:00
PsiOmegaDelta daa9b0e0bc When a diona splits, the main nymph inherits all known languages.
Fixes #11401.
2015-11-04 17:50:51 +01:00
PsiOmegaDelta 1648e46dcf Merge pull request #11408 from Baystation12/dev-freeze
Dev
2015-11-03 17:50:53 +01:00
PsiOmegaDelta 1fa73c0c18 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-11-03 17:37:46 +01:00
HarpyEagle f49b6d7cd1 Fixes #11405 2015-11-02 23:35:25 -05:00
PsiOmegaDelta 19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta 694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
PsiOmegaDelta 392fd6210d Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE
Allows drones to recharge their synth materials.
2015-11-01 18:43:43 +01:00
PsiOmegaDelta 8b98b059a4 Merge pull request #11397 from Baystation12/dev-freeze
Dev freeze
2015-10-31 16:43:02 +01:00
PsiOmegaDelta 461023b5e7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-10-31 16:31:05 +01:00
Neerti 865f4b1d38 Revert "Comments out clothing coverage." 2015-10-31 04:15:36 -04:00
PsiOmegaDelta 3864257e0b Merge pull request #11321 from mwerezak/lung-rupture
Resolves #11319
2015-10-30 19:05:05 +01:00
Mark9013100 61f9608324 Comments out clothing coverage.
Comments out the slot_is_accessible flag.
2015-10-30 13:45:43 -04:00
Neerti 92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04:00
PsiOmegaDelta 2ba9c7bc79 Allows drones to recharge their synth materials.
Fixes #11387.
2015-10-28 09:17:31 +01:00
PsiOmegaDelta 9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
PsiOmegaDelta 3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
mwerezak 2f4d1dd7b1 Adds IPC specific halloss stun messages 2015-10-25 23:39:06 -04:00
Chinsky 5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup
Character setup refactor.
2015-10-26 05:44:13 +03:00
Chinsky 35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
PsiOmegaDelta e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta a3027febee Merge pull request #11373 from Baystation12/master
Dev-freeze.
2015-10-25 20:00:44 +01:00
PsiOmegaDelta 7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
Chinsky 28637334d4 Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration
Relocates synth flash recharge code.
2015-10-24 18:59:02 +03:00
PsiOmegaDelta d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta 8305404a14 Can no longer use utensils to eat if you lack the means.
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
2015-10-22 16:52:07 +02:00
PsiOmegaDelta 0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta db833735a8 Merge pull request #11340 from Baystation12/master
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta a60103982b Merge pull request #11311 from Ccomp5950/stop_stop_hes_already_dead
Dead people feel no pain.
2015-10-19 07:08:25 +02:00
PsiOmegaDelta 64176f1c4e Relocates synth flash recharge code.
Moves the flash recharge from security modules to all of them. Fixes #11322.
2015-10-18 17:55:56 +02: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
ccomp5950 9aea0cecc7 Dead people feel no pain.
Resolves #10797
2015-10-18 01:27:24 -04:00
HarpyEagle ffc50c3cfa Fixes #11321 2015-10-17 20:53:03 -04:00