Zuhayr
622fb93a3e
Emergency fix for HasProximity being passed a turf.
2015-12-01 18:07:21 -05:00
Neerti
602493cc08
Removes gun firing logs due to possible lag.
2015-12-01 14:12:35 -05:00
Zuhayr
4487db9c14
Fixes several issues with drones.
2015-12-01 09:38:12 -05:00
Neerti
765ac00c6c
Merge pull request #367 from Neerti/12/1/2015_armor_refactor
...
Refactors how armor works.
2015-12-01 04:32:30 -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
Datraen
f48bdb3c66
Merge pull request #366 from Datraen/DevTweaks
...
Lets mods see and toggle attack logs.
2015-12-01 01:15:23 -05:00
Datraen
1886eaa066
Lets mods see and toggle attack logs.
2015-12-01 01:07:45 -05:00
Mark9013100
7a26afb464
Merge branch 'master' into 11/29/2015FixesandEdits1
2015-11-30 23:39:25 -05:00
Datraen
6f6cb4661f
Merge branch 'master' into Devtweaks
2015-11-29 22:36:08 -05:00
Datraen
3506e0861c
Fixes jumping, adds dev access to msay and ahelps.
2015-11-29 22:34:00 -05:00
Neerti
75c574eddd
Adds verb to toggle hub visibility.
2015-11-29 22:06:05 -05:00
SinTwo
bc2f3ce654
Merge branch 'master' into Moderator
2015-11-29 13:40:27 -05:00
SinTwo
8d747eed8d
Moderator Logs
2015-11-29 13:34:00 -05:00
Neerti
5b59945032
Fixes gun aiming, adds logging for aiming and firing, and ballistic weapons should no longer be named 'the three round burst' or such.
2015-11-29 12:44:10 -05:00
Mark9013100
880ba681e6
Combination of my previous PRs, mostly fixes
2015-11-29 11:13:17 -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
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
Neerti
78e5701b5c
Replaces most instances of Nyx to Vir.
2015-11-26 01:01:06 -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 e40246e9dfc9feb28b8c5a0a7ce765fd063c4f7e)
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
2015-11-20 07:46:31 -05:00
Neerti
05ec2e7c28
Fixes gun mode switching.
2015-11-19 07:27:34 -05:00
Neerti
dd3ab4dac0
Finishes new ling, need better sprites but that's for another time.
2015-11-18 16:20:28 -05:00
SinTwo
c88689662c
Merge pull request #1 from PolarisSS13/master
...
Update
2015-11-08 18:51:43 -05:00
SinTwo
8c816a9f28
Helmets
2015-11-08 18:10:34 -05:00
SinTwo
05377d0f5d
Hoods
2015-11-08 18:10:19 -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
Datraen
a1757ee696
Removes acetone and hydrazine from the chem list.
2015-11-05 19:41:04 -05:00
Datraen
6660b6f61c
Tweaks plants to create a more diverse selection, different environment constants.
2015-11-05 18:43:05 -05: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
PsiOmegaDelta
42b98c45e4
Merge pull request #11220 from caelaislinn/new_xenoarch_sprites
...
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
2015-11-03 11:14:03 +01:00
HarpyEagle
f49b6d7cd1
Fixes #11405
2015-11-02 23:35:25 -05:00
PsiOmegaDelta
ae4d463fcb
Map cleanup, tweaks and merge fixes.
2015-11-02 10:05:14 +01: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
Chinsky
e2bdcef127
Merge pull request #11386 from Dibasic/patch-1
...
Reduces wizard subjugate duration
2015-11-02 00:09:12 +03: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
