Commit Graph

12394 Commits

Author SHA1 Message Date
PsiOmegaDelta
c826d3d237 Fixes being unable to eat.
Silly 1-based indexing.
2015-11-20 11:21:39 +01:00
PsiOmegaDelta
aa3a62fe32 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-19 08:59:24 +01: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
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
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
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
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
PsiOmegaDelta
a3027febee Merge pull request #11373 from Baystation12/master
Dev-freeze.
2015-10-25 20:00:44 +01:00
Chinsky
28637334d4 Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration
Relocates synth flash recharge code.
2015-10-24 18:59:02 +03:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means.
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
2015-10-22 16:52:07 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master
Dev-freeze.
2015-10-21 10:36:30 +02:00
Chinsky
18ae968bda Merge pull request #11337 from PsiOmegaDelta/151020-Mmm_hydrogen
Fixes #11334.
2015-10-21 01:56:16 +03:00
Chinsky
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood
Limits the number of runes to one per turf.
2015-10-21 01:56:08 +03:00
PsiOmegaDelta
4c96cd62a7 Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. 2015-10-20 17:11:55 +02:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf.
Fixes #11248.
2015-10-19 12:49:32 +02:00
PsiOmegaDelta
a60103982b Merge pull request #11311 from Ccomp5950/stop_stop_hes_already_dead
Dead people feel no pain.
2015-10-19 07:08:25 +02:00
PsiOmegaDelta
64176f1c4e Relocates synth flash recharge code.
Moves the flash recharge from security modules to all of them. Fixes #11322.
2015-10-18 17:55:56 +02:00
ccomp5950
9aea0cecc7 Dead people feel no pain.
Resolves #10797
2015-10-18 01:27:24 -04:00
HarpyEagle
ffc50c3cfa Fixes #11321 2015-10-17 20:53:03 -04:00
Atlantis
a70ec21e64 Fixes #11276
- Re-adjusts two values to take new lighting in account.
- For reference. Turf which has light fixture (large) on it, has light value of 6. An average half-lit turf has around 1.5. These values were obtained via in-game tests.
- Using old values, diona would die (without another light source such as flashlight) when standing on any other turf other than turf with light fixture.
- Now it should be relatively similar to the old values before lighting changes.
2015-10-16 14:17:47 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
ccomp5950
111973ed5c AI's can now use languages through holopads...
...and have it respect if the listener understands.

Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217  (pAIs cannot hear AI hologram speech)
2015-10-15 19:56:45 -04:00
Chinsky
0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag
Cleans up antag auto-spawning, adds checks for active antags
2015-10-15 19:16:13 +03:00
Snapshot
d75a146cc3 Merge pull request #11306 from mwerezak/sunglasses-loadout
Fixes #11216
2015-10-15 07:47:21 -07:00
mwerezak
7272deb5ae Fixes #11216
Sunglass-derived custom gear is now only available to roles that normally have access to them.
2015-10-15 06:58:25 -04:00
mwerezak
27fe99bdf0 Reagent transfer now checks simulated var 2015-10-15 06:46:07 -04:00
mwerezak
41e8798516 Adjusts chemsmoke breathing
Inhaled reagents are now split between bloodstream and ingestion.
Reagents are not inhaled if environment pressure is too low.
2015-10-15 06:45:22 -04:00