Commit Graph

12863 Commits

Author SHA1 Message Date
PsiOmegaDelta
033708b8e6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-19 09:06:32 +01:00
PsiOmegaDelta
aa3a62fe32 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-19 08:59:24 +01:00
Chinsky
a287e47c28 Merge pull request #11364 from PsiOmegaDelta/151024-Btime
Scheduler now uses btime, and other improvements.
2015-11-19 10:14:03 +03:00
Chinsky
f9e56ddb18 Merge pull request #11349 from PsiOmegaDelta/151023-Wires
Converts the nuclear bomb to the new wire system.
2015-11-19 10:11:13 +03: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
PsiOmegaDelta
4586068823 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-16 18:20:20 +01:00
PsiOmegaDelta
ee13279003 Merge pull request #11453 from Baystation12/master
Dev-freeze
2015-11-16 18:13:18 +01:00
PsiOmegaDelta
9e321ff6d5 Updates the nuclear bomb code and makes it utilize NanoUI, ported from Paradise. 2015-11-15 13:08:42 +01:00
PsiOmegaDelta
dbedb0b414 Corrects AI sight.
Fixes #11450.
2015-11-15 10:51:13 +01:00
PsiOmegaDelta
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
GinjaNinja32
7c1fb1fde9 Merge pull request #11442 from PsiOmegaDelta/151111-CharacterSetupTweaks
Character setup tweaks.
2015-11-13 05:05:32 +00:00
PsiOmegaDelta
1c053c7a9f Merge pull request #11444 from Baystation12/dev-freeze
Dev
2015-11-12 17:48:12 +01:00
Chinsky
f247ea1df6 Merge pull request #11379 from mwerezak/ipctemp
Fixes #11354
2015-11-12 02:02:45 +03:00
Chinsky
6f472df56a Merge pull request #11441 from Kelenius/lathefix
Fixes #11347
2015-11-12 02:02:29 +03:00
PsiOmegaDelta
e40246e9df 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.
2015-11-11 13:50:22 +01:00
mwerezak
7e472af238 Fixes temperature HUD being incorrect for species with null body_temperature. 2015-11-10 23:53:18 -05:00
mwerezak
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
Kelenius
531809efa2 Fixes #11347
Jesus Christ how horrifying
2015-11-10 14:15:37 +03:00
PsiOmegaDelta
be542f23b0 Compilation fixes. 2015-11-10 10:56:44 +01:00
PsiOmegaDelta
527254dcc8 Merge remote-tracking branch 'upstream/dev' into 151108-CleanMiceDeath 2015-11-10 10:54:10 +01:00
PsiOmegaDelta
eb37292120 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-10 10:37:22 +01:00
PsiOmegaDelta
2968952913 Merge pull request #11438 from Baystation12/master
Dev-freeze
2015-11-10 10:34:40 +01:00
PsiOmegaDelta
b84280871f Merge pull request #11420 from Datraen/PlantTweaks
[BOTANY] [Seeds] Plant trait tweaks.
2015-11-10 08:42:03 +01:00
PsiOmegaDelta
f5e565507d Merge pull request #11429 from atlantiscze/gridcheck
Updates gridcheck behavior
2015-11-10 08:41:54 +01:00
PsiOmegaDelta
6f559779b5 Additional respawn refactoring.
Removes a non-utilized config setting.
Adds a config setting to set the respawn timer, defaults to 30 minutes as today.
Makes the MayRespawn() proc utilize this config setting. Makes more uses of MayRespawn() check the respawn delay.
2015-11-08 20:05:37 +01:00
PsiOmegaDelta
4ab55646a6 Cleaner mouse death.
Mouse that go splat now call death() instead of doing partial death handling.
When one wishes to join as mouse timeofdeath is checked, instead of a snowflake var.
2015-11-08 13:03:02 +01:00
Atlantis
12330517a5 Minor update
- Severity now influences gridcheck duration.
- Adds changelog.
2015-11-07 18:05:47 +01:00
PsiOmegaDelta
5c587e69b6 Exploit fix.
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +01:00
Atlantis
661b5968d9 Updates gridcheck behavior
- Gridcheck random event is updated. Core behavior remains the same, but mechanism it uses to achieve power outage is changed.
- Both SMESs and APCs have new variable which is set by gridcheck. This variable decrements by 1 every tick, and until it is back to zero the APC/SMES won't work.
- SMESs are disabled for 60-120 seconds (random for each SMES). APCs for 120-240 seconds.
- Both SMESs and APCs show error UI with timer counting down until the device restarts (begins working again).
- Both SMEss and APCs may be manually restarted, on per-device basis, by clicking restart button in the UI. This is useful if you urgently need one or two devices back online, for example, medical treatment facilities, etc. This immediately skips the X second timer and restores the device to working state, while keeping the original intention of this event - allowing antagonists to use lack of power to enter areas they don't normally have access to.
2015-11-07 17:11:25 +01: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
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
PsiOmegaDelta
3864257e0b Merge pull request #11321 from mwerezak/lung-rupture
Resolves #11319
2015-10-30 19:05:05 +01:00
Daranz
4b42f69247 Fix a problem with solar control computers not connecting to powernets on build 2015-10-28 13:35:24 -04:00
PsiOmegaDelta
2ba9c7bc79 Allows drones to recharge their synth materials.
Fixes #11387.
2015-10-28 09:17:31 +01:00