PsiOmegaDelta
554af8e9ca
Merge pull request #11530 from Baystation12/master
...
Dev-f
2015-11-28 11:48:39 +01:00
Chinsky
035a2eb195
Merge pull request #11525 from GinjaNinja32/info
...
info topic improvements
2015-11-28 01:16:56 +03:00
GinjaNinja32
b15497aa51
info topic improvements
2015-11-26 20:27:51 +00:00
PsiOmegaDelta
9b1123cbaa
Replaces misc. checks with usr.incapacitated().
2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-24 14:02:15 +01:00
PsiOmegaDelta
0e5fc06b13
Merge pull request #11491 from Datraen/Trayfix
...
Fixes Non-human, Non-synth mobs (ghosts, mice) being able to interact with trays.
2015-11-24 10:48:17 +01:00
GinjaNinja32
b72cb1f45b
Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle
...
Makes shuttle control consoles sturdier.
2015-11-23 09:28:03 +00:00
Bjorn Neergaard
0f78998377
Fix Dionea home system
...
Fixes #11492
2015-11-22 20:34:29 -06:00
PsiOmegaDelta
26f167453c
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-22 11:40:44 +01:00
PsiOmegaDelta
782f0a8bfb
Makes shuttle control consoles sturdier.
...
Fixes #11501 .
2015-11-22 11:37:14 +01:00
PsiOmegaDelta
0dd630124c
Merge pull request #11486 from neersighted/master
...
Fix Laptop Vendors and Personal Lockers not accepting ID Containers
2015-11-22 11:20:12 +01:00
Bjorn Neergaard
ef1f91e334
Fix Laptop Vendors and Personal Lockers not accepting ID Containers
...
Fixes #11092
2015-11-22 00:27:03 -06:00
Datraen
301f7f5c8d
Fixes #11489 , fixes labels as well
2015-11-20 19:37:00 -05:00
Datraen
a79a8746e0
Fixes #11489
2015-11-20 18:30:52 -05:00
GinjaNinja32
8e1928062b
sulphuric acid is "sacid" not "acid"
2015-11-20 21:41:31 +00:00
PsiOmegaDelta
c826d3d237
Fixes being unable to eat.
...
Silly 1-based indexing.
2015-11-20 11:21:39 +01:00
Zuhayr
959e15826b
Fixes grown food not leaving trash.
2015-11-20 20:02:05 +10:30
PsiOmegaDelta
aa3a62fe32
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-19 08:59:24 +01:00
Chinsky
ed7386f306
Fixes #11356
2015-11-19 04:06:14 +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
ee13279003
Merge pull request #11453 from Baystation12/master
...
Dev-freeze
2015-11-16 18:13:18 +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
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
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
2968952913
Merge pull request #11438 from Baystation12/master
...
Dev-freeze
2015-11-10 10:34:40 +01:00
PsiOmegaDelta
5c587e69b6
Exploit fix.
...
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +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
Chinsky
bef8d99703
Merge pull request #11409 from PsiOmegaDelta/151104-DionaLanguage
...
When a diona splits, the main nymph inherits all known languages.
2015-11-06 00:37:48 +03:00
PsiOmegaDelta
73f99a4c01
Secondary diona nymphs now get non-restricted/whitelisted languages on split.
2015-11-05 10:04:00 +01:00
PsiOmegaDelta
20eb505c69
Adds antag datum flag that is used to exlude the type from random selection.
...
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes #11416 .
2015-11-05 08:48:05 +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
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
694a35c10b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-02 09:08:06 +01:00
Chinsky
e05b08db10
Merge pull request #11394 from PsiOmegaDelta/151029-GasCircuits
...
Atmospheric computer circuit additions.
2015-11-02 00:08:35 +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
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
PsiOmegaDelta
ab2ddfcba7
Atmospheric computer circuit additions.
...
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392 .
Computers also no longer attemps to qdel a type on Destroy()
2015-10-29 16:55:58 +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
PsiOmegaDelta
dd855b5259
Compilation fixes.
2015-10-27 12:47:35 +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
28db4587f2
Fixes #11354
2015-10-26 14:50:52 -04:00
mwerezak
2f4d1dd7b1
Adds IPC specific halloss stun messages
2015-10-25 23:39:06 -04:00
Chinsky
35ce07aa71
Merge pull request #11296 from mwerezak/pepperspray-fix
...
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
