Commit Graph

20570 Commits

Author SHA1 Message Date
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
NullSnapshot
d94ece66f1 Fixes: #11354 2015-10-25 21:52:11 -07:00
NullSnapshot
4694a263a7 Fixes: #11351 #11357 #11359 #11361 2015-10-25 21:51:31 -07: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
NullSnapshot
c5fd677206 Fixes #11350 2015-10-25 18:10:14 -07:00
NullSnapshot
00e0014a3f fixes #9962 2015-10-25 17:52:49 -07:00
NullSnapshot
e5ca86c168 fixes random name EAL naming thing... again. 2015-10-25 17:40:34 -07: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
7080020997 Merge pull request #11338 from PsiOmegaDelta/151020-TemporarilyForever
Airlocks should no longer be temporarily electrified for the rest of the round.
2015-10-21 01:56:32 +03: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
Chinsky
0b81edb0fe Merge pull request #11327 from PsiOmegaDelta/151017-MalfTweaks
Malf announcement type change.
2015-10-21 01:54:03 +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
2a936d247d Airlocks should no longer be temporarily electrified for the rest of the round.
Airlocks are no longer electrified for as long as the round has been going when EMPd.
2015-10-20 08:33:47 +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
mwerezak
47ace5ed3e Chem smoke refactor 2015-10-18 11:54:17 -04:00
ccomp5950
9aea0cecc7 Dead people feel no pain.
Resolves #10797
2015-10-18 01:27:24 -04:00