Commit Graph

20570 Commits

Author SHA1 Message Date
PsiOmegaDelta
9d0c072b4a Adjusts Bump flags to make ALLMOBS mean all mobs again. 2015-08-17 08:06:42 +02:00
NullSnapshot
438837a9be Moves ProcessScheduler list to new Processes tab. 2015-08-16 22:46:18 -07:00
PsiOmegaDelta
1dcdb423c7 Merge pull request #10685 from mwerezak/skipjack
Fixes
2015-08-17 06:56:50 +02:00
GinjaNinja32
917f6f0250 Add Medical Equipment access to Chemists 2015-08-17 05:45:34 +01:00
mwerezak
f09b754a19 Fixes #10636 2015-08-16 15:20:59 -04:00
mwerezak
887a515483 Fixes #10659 2015-08-16 14:58:50 -04:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmega
4d826e68cb Mob bump fixes.
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
2015-08-16 20:55:02 +02:00
mwerezak
b21bd0c42d Ports fix for #10660 from vg
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
GinjaNinja32
f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
Synth say fixes.
2015-08-16 14:55:04 +01:00
GinjaNinja32
0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
PsiOmega
21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
PsiOmega
0b01482eb6 Synth say fixes.
Adds synth message sanitizing. Fixes #10667.
Makes sure say() code at least to some degree returns expected values. Fixes #10675.
2015-08-16 14:00:29 +02:00
Zuhayr
0c2d0852ae Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration
Round Duration display
2015-08-16 03:40:23 -07:00
PsiOmegaDelta
7b5b7162d0 Merge pull request #10673 from Baystation12/master
Dev-freeze
2015-08-16 10:30:13 +02:00
PsiOmegaDelta
311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix
Fixes overdose not working for ingested reagents
2015-08-16 10:18:16 +02:00
mwerezak
176e4232ca Fixes #9155
Heaters and freezers now check if there are other machines in their turf that have the same connection dirs.
2015-08-15 18:28:09 -04:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
mwerezak
4b21f5f8ad Fixes pipes disappearing when wrenching fails 2015-08-15 15:46:52 -04:00
mwerezak
5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
volas
982ec2df21 Fixes #10508 2015-08-15 14:01:19 +03:00
Kelenius
cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius
24fb46f1a9 Fixes #9332 2015-08-15 13:05:49 +03:00
Kelenius
3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
PsiOmega
395df6d9c2 Compilation fixes. 2015-08-15 10:58:32 +02:00
PsiOmega
cda0ecfa97 Relocates Malfunction code to appropriate location. 2015-08-15 10:52:39 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak
f6b9e7fb7e Merge pull request #10650 from NullSnapshot/hotfix
large crate fix
2015-08-15 02:03:39 -04:00
Snapshot
3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix
Fixes #10621
2015-08-14 22:51:43 -07:00
Null Snapshot
0255b79114 Fixes a problem with crates containing animals not spitting out their mobs. 2015-08-14 22:47:53 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50 Fixes #10621
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
2015-08-14 23:44:46 -04:00
Chinsky
4ba0a65420 Merge pull request #10648 from mwerezak/circuit-printer
Fixes #10637
2015-08-15 06:37:31 +03:00
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
mwerezak
133bc96344 Fixes #10645
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
Chinsky
8a21670d0b Merge pull request #10639 from GinjaNinja32/language
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
2015-08-15 06:11:58 +03:00
Chinsky
6ab8a11da8 Merge pull request #10646 from mwerezak/aghost
Aghosted mobs no longer act as SSD
2015-08-15 06:10:49 +03:00
mwerezak
cd153ad975 Aghosted mobs no longer act as SSD
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
2015-08-14 22:41:51 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans
Newmalf Fixes
2015-08-15 03:36:35 +01:00
GinjaNinja32
74f47de0e5 'fixes' spacestation13.com's server banner
they appear to just use the 8th field of the reply for the player count, rather than parsing the reply; this moves player count back to being the 8th entry
2015-08-15 03:18:40 +01:00
Atlantis
7e8bfde893 Increases CPU income from APC hacking
- CPU generation from APCs is now doubled
2015-08-14 23:03:48 +02:00
Atlantis
20961ae9b6 Corrects wrongly displayed CPU generation.
- Value displayed was per decisecond, not per second. Corrected.
2015-08-14 23:00:53 +02:00
Atlantis
e7adce2163 Better feedback
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
2015-08-14 22:51:59 +02:00
GinjaNinja32
2847c08b77 Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages 2015-08-14 21:30:09 +01:00
PsiOmegaDelta
3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
mwerezak
4fab38a7c6 Merge pull request #10622 from comma/virofixes
Virofixes
2015-08-13 23:16:59 -04:00
Chinsky
0056a889de Moved antibodies to the rest of reagents.
Updates them to use new chem processing.
Also axes unused commented out code.
2015-08-14 04:53:46 +03:00
Chinsky
38adf2c5b4 Fixes #10294
Now if virus can infect lesser/greater form of specie, it can infect its counterpart.
Also made viruses affect only joinable species to lessen a chance of spawning a virus that they can't work on (e.g. slime-affecting viruses that can't be injected into monkeys). As a side-effect viro reports are a little less inane listing all the species crewmembers aren't supposed to know about like xenomorphs and Shadows.
2015-08-14 04:20:44 +03:00
mwerezak
1f7497063a Merge pull request #10618 from GinjaNinja32/10617
fix #10617
2015-08-13 16:20:32 -04:00