Commit Graph

6334 Commits

Author SHA1 Message Date
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
Neerti
a25c728c07 Merge pull request #509 from Hubblenaut/master
Fixes onmob icons for holders
2015-12-10 13:40:31 -05:00
Hubblenaut
9980b7ef13 Fixes onmob icons for holders 2015-12-10 19:17:13 +01:00
Neerti
9d4d8e3998 Merge pull request #508 from Hubblenaut/flavor
Tiny Fixes
2015-12-10 12:44:43 -05:00
Hubblenaut
95a190ae30 Fixes empty flavor text drawing two spaces 2015-12-10 18:07:00 +01:00
GinjaNinja32
6c736adfbb fix autohiss for fully-capitalised strings 2015-12-10 10:55:41 +00:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Hubblenaut
183ac02f32 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
Conflicts:
	html/changelogs/Hubblenaut-dev.yml
2015-12-08 15:50:00 +01:00
Hubblenaut
baec8f15d1 Changes to Pushing Mechanics 2015-12-08 15:15:00 +01:00
Neerti
ffab1eda95 Fucking fuck. 2015-12-05 18:01:32 -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
Datraen
ca6a970182 Fixes the inability to use cargo tugs 2015-12-05 15:15:53 -05:00
Jon
7993d10a3b I'm a moron and this will teach me to not lazy copypaste. 2015-12-05 18:22:48 +00:00
Jon
cb62041cad Adds an "emo fringe" hairstyle that's just emo long without the long bits. I quite like it so whatever. 2015-12-05 15:38:54 +00:00
sabess
dc816938ae Adds some hairstyles! 2015-12-06 01:56:29 +11:00
MagmaRam
e7952d2334 Halves light necessary for diona to live
Halves the amount of light diona need to feed/maintain health/whatever.
Shouldn't affect the rate at which they do these things, it should only touch
the rate.
2015-12-03 23:20:12 -06:00
SinTwo
6c59f7f6ff Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sin2clothes 2015-12-03 18:29:05 -05:00
SinTwo
700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
Neerti
c137d40484 Makes stating laws over binary work again. 2015-12-03 14:16:01 -05:00
Neerti
58149b8f4d Replaces :b with #b whenever a synthetic mob joins the game. 2015-12-03 14:02:56 -05:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
PsiOmegaDelta
2d39621801 Makes it possible to ignore some incapacitation checks.
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
2015-12-03 12:37:30 -05:00
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