dd3ab4dac0
Finishes new ling, need better sprites but that's for another time.
2015-11-18 16:20:28 -05:00
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
ee13279003
Merge pull request #11453 from Baystation12/master
...
Dev-freeze
2015-11-16 18:13:18 +01:00
8584513652
Fixes the mining rig camera not properly showing up on the station camera list.
...
Was using "Mine" instead of "MINE. Corrected by replacing all networks with the defined presets.
2015-11-14 00:43:11 +01:00
f247ea1df6
Merge pull request #11379 from mwerezak/ipctemp
...
Fixes #11354
2015-11-12 02:02:45 +03:00
6f472df56a
Merge pull request #11441 from Kelenius/lathefix
...
Fixes #11347
2015-11-12 02:02:29 +03:00
7e472af238
Fixes temperature HUD being incorrect for species with null body_temperature.
2015-11-10 23:53:18 -05:00
52deec9fde
Adds thermal radiation into space for human mobs
...
Main effect is that IPCs won't gain temperature infinitely anymore.
2015-11-10 23:52:41 -05:00
531809efa2
Fixes #11347
...
Jesus Christ how horrifying
2015-11-10 14:15:37 +03:00
2968952913
Merge pull request #11438 from Baystation12/master
...
Dev-freeze
2015-11-10 10:34:40 +01:00
c88689662c
Merge pull request #1 from PolarisSS13/master
...
Update
2015-11-08 18:51:43 -05:00
8c816a9f28
Helmets
2015-11-08 18:10:34 -05:00
05377d0f5d
Hoods
2015-11-08 18:10:19 -05:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
5c587e69b6
Exploit fix.
...
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +01:00
f3c1be4241
Fixes socks and preview icon.
2015-11-06 23:20:50 -05:00
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
db59f87cb0
Merge pull request #11424 from PsiOmegaDelta/151106-RuntimeFlashing
...
Fixes #11422 .
2015-11-06 13:10:24 -05:00
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
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
31536c6a56
Fixes #11422 .
...
There is nothing to see here...
2015-11-06 11:13:31 +01:00
a1757ee696
Removes acetone and hydrazine from the chem list.
2015-11-05 19:41:04 -05:00
6660b6f61c
Tweaks plants to create a more diverse selection, different environment constants.
2015-11-05 18:43:05 -05:00
73f99a4c01
Secondary diona nymphs now get non-restricted/whitelisted languages on split.
2015-11-05 10:04:00 +01:00
5f4af85af9
Refactors diona split code for maximum reuse.
2015-11-05 08:15:10 +01:00
daa9b0e0bc
When a diona splits, the main nymph inherits all known languages.
...
Fixes #11401 .
2015-11-04 17:50:51 +01:00
1648e46dcf
Merge pull request #11408 from Baystation12/dev-freeze
...
Dev
2015-11-03 17:50:53 +01:00
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
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
f49b6d7cd1
Fixes #11405
2015-11-02 23:35:25 -05:00
ae4d463fcb
Map cleanup, tweaks and merge fixes.
2015-11-02 10:05:14 +01:00
19051ec27e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-11-02 09:25:04 +01:00
694a35c10b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-02 09:08:06 +01:00
e2bdcef127
Merge pull request #11386 from Dibasic/patch-1
...
Reduces wizard subjugate duration
2015-11-02 00:09:12 +03:00
392fd6210d
Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE
...
Allows drones to recharge their synth materials.
2015-11-01 18:43:43 +01:00
8b98b059a4
Merge pull request #11397 from Baystation12/dev-freeze
...
Dev freeze
2015-10-31 16:43:02 +01:00
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
865f4b1d38
Revert "Comments out clothing coverage."
2015-10-31 04:15:36 -04:00
3864257e0b
Merge pull request #11321 from mwerezak/lung-rupture
...
Resolves #11319
2015-10-30 19:05:05 +01:00
61f9608324
Comments out clothing coverage.
...
Comments out the slot_is_accessible flag.
2015-10-30 13:45:43 -04:00
1125961c18
Merge branch 'dev2' of https://github.com/PolarisSS13/Polaris into 10/20/2015_finish_ling
2015-10-29 21:45:01 -04:00
92c1c468e4
Despite the name, they're not done, because reasons.
2015-10-29 21:22:42 -04:00
4b42f69247
Fix a problem with solar control computers not connecting to powernets on build
2015-10-28 13:35:24 -04:00
2ba9c7bc79
Allows drones to recharge their synth materials.
...
Fixes #11387 .
2015-10-28 09:17:31 +01:00
c905fb9bc7
Reduces wizard subjugate duration
...
Reduces wizard subjugate duration to one third of previous duration. General agreement in this thread: http://baystation12.net/forums/threads/vote-remove-wizard-subjugate.1007/
Because a robeless spell shouldn't take you out of the round for as long as the respawn timer lasts.
2015-10-27 15:14:40 -05:00
3dcd35508f
Compilation fixes.
2015-10-27 13:43:30 +01:00
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
dd855b5259
Compilation fixes.
2015-10-27 12:47:35 +01:00
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
9b9bcff9de
Brings back the Ausop helmets added in one of my earlier PRs.
...
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
Neerti